From cc91c286ed8384f9f43d0024a3459da989895ca6 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期一, 02 三月 2026 10:47:43 +0800
Subject: [PATCH] 1
---
WebTM/views/领料发货/领料出库/Kf_MateOutBackBillEdit.html | 223 +++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 189 insertions(+), 34 deletions(-)
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBackBillEdit.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBackBillEdit.html"
index 5c77d1a..c84cca1 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBackBillEdit.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBackBillEdit.html"
@@ -57,6 +57,15 @@
</div>
</div>
<div class="layui-inline">
+ <label class="layui-form-label">鍗曟嵁绫诲瀷</label>
+ <div class="layui-input-inline">
+ <select name="HBillSubType" lay-filter="HBillSubType" id="HBillSubType">
+ <option value="鏍囧噯棰嗘枡" selected="selected">鏍囧噯棰嗘枡</option>
+ <option value="鐧藉澂棰嗘枡">鐧藉澂棰嗘枡</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
<label class="layui-form-label">鏃ユ湡</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">
@@ -121,6 +130,7 @@
<div class="layui-input-inline">
<select name="HSourceBillType" lay-filter="HSourceBillType" id="HSourceBillType">
<option value="3720" selected="selected">鐢熶骇鐢ㄦ枡娓呭崟</option>
+ <option value="3710">鐢熶骇璁㈠崟</option>
</select>
</div>
</div>
@@ -548,42 +558,179 @@
});
//琛ㄥご婧愬崟寮圭獥
form.on('submit(HSourceInterList)', function () {
- //椤甸潰灞�-鑷畾涔�
- layer.open({
- type: 2,
- skin: 'layui-layer-rim', //鍔犱笂杈规
- title: '鐢熶骇鐢ㄦ枡鍒楄〃',
- closeBtn: 1,
- shift: 2,
- area: ['80%', '80%'],
- maxmin: true,
- content: ['../../鐢熶骇绠＄悊/鐢熶骇鎶曟枡鍗�/Sc_PPBomBillList.html', 'yes'],
- btn: ['纭畾', '鍙栨秷']
- , btn1: function (index, layero) {
+ var sourceBillType = $("#HSourceBillType").val();
+ var url = '';
+ var title = '';
- //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
- 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('璇烽�夋嫨鏁版嵁');
+ if (sourceBillType == '3720') {
+ url = '../../鐢熶骇绠＄悊/鐢熶骇鎶曟枡鍗�/Sc_PPBomBillList.html';
+ title = '鐢熶骇鐢ㄦ枡鍒楄〃';
+
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: title,
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: [url, 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HSourceBillNo").val(checkStatus.data[0].鍗曟嵁鍙�);
+ $("#HSourceInterID").val(checkStatus.data[0].hmainid);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
- $("#HSourceBillNo").val(checkStatus.data[0].鍗曟嵁鍙�);
- $("#HSourceInterID").val(checkStatus.data[0].hmainid);
- layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
- }
- , btn2: function (index, layero) {
- //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
- //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
- },
- end: function () {
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+ },
+ success: function (layero, index) {
+ }
+ });
+ }
+ else if (sourceBillType == '3710') {
+ // 鐢熶骇璁㈠崟锛堝閫夎拷鍔犲埌瀛愯〃锛�
+ url = '../../鐢熶骇绠＄悊/鐢熶骇浠诲姟鍗�/Sc_ICMOBillList.html?openType=2';
+ title = '鐢熶骇璁㈠崟鍒楄〃';
- },
- success: function (layero, index) {
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: title,
+ closeBtn: 1,
+ shift: 2,
+ area: ['90%', '90%'],
+ maxmin: true,
+ content: [url, 'yes'],
+ btn: ['纭畾杩藉姞', '鍙栨秷']
+ , btn1: function (index, layero) {
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
- }
- });
+ // 娓呯┖琛ㄥご婧愬崟淇℃伅锛堝洜涓烘槸鎸夎杩藉姞锛�
+ $("#HSourceBillNo").val(checkStatus.data[0].鍗曟嵁鍙�);
+ $("#HSourceInterID").val(checkStatus.data[0].hmainid);
+
+ // 璋冪敤鍑芥暟灏嗛�変腑鐨勬暟鎹拷鍔犲埌瀛愯〃
+ appendICMODataToTable(checkStatus.data);
+ layer.close(layer.index); //鍏抽棴寮圭獥
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+ },
+ success: function (layero, index) {
+ }
+ });
+ }
+ else {
+ layer.msg('鏈煡鐨勬簮鍗曠被鍨�');
+ }
});
+ //#region 鐢熶骇璁㈠崟鏁版嵁杩藉姞鍒板瓙琛�
+ function appendICMODataToTable(selectedData) {
+ if (!selectedData || selectedData.length === 0) {
+ layer.msg('鏈�夋嫨鏈夋晥鏁版嵁');
+ return;
+ }
+ // 鑾峰彇褰撳墠琛ㄦ牸鏁版嵁
+ var currentData = table.cache["mainTable"] || [];
+
+ // 妫�鏌ョ涓�琛屾槸鍚︽槸绌鸿锛堟墍鏈夊叧閿瓧娈甸兘鏄┖鎴�0锛�
+ var firstRowIsEmpty = true;
+ if (currentData.length > 0) {
+ var firstRow = currentData[0];
+ if (firstRow.HMaterID !== 0 && firstRow.HMaterID !== "0") {
+ firstRowIsEmpty = false;
+ }
+ if (firstRow.HMaterCode && firstRow.HMaterCode.trim() !== "") {
+ firstRowIsEmpty = false;
+ }
+ if (firstRow.HMaterName && firstRow.HMaterName.trim() !== "") {
+ firstRowIsEmpty = false;
+ }
+ }
+
+ // 濡傛灉绗竴琛屾槸绌鸿锛屽垯鍏堟竻绌鸿〃鏍兼暟鎹�
+ if (firstRowIsEmpty) {
+ currentData = [];
+ table.cache["mainTable"] = currentData;
+ }
+
+ var addedCount = 0;
+
+ // 閬嶅巻鎵�鏈夐�変腑鐨勮
+ for (var i = 0; i < selectedData.length; i++) {
+ var rowData = selectedData[i];
+
+ // 纭繚鏁版嵁鏈夋晥鎬�
+ if (!rowData.HMaterID || rowData.HMaterID === 0) {
+ // 濡傛灉琛屾暟鎹腑娌℃湁HMaterID锛屽皾璇曚娇鐢ㄥ叾浠栧瓧娈�
+ if (!rowData.浜у搧浠ｇ爜 || rowData.浜у搧浠ｇ爜.trim() === "") {
+ continue; // 璺宠繃鏃犳晥鏁版嵁
+ }
+ }
+
+ // 鏋勯�犲瓙琛ㄨ鏁版嵁
+ var newRow = {
+ "HMaterID": rowData.HMaterID || 0,
+ "HMaterCode": rowData["浜у搧浠ｇ爜"] || rowData["鐗╂枡浠ｇ爜"] || "",
+ "HMaterName": rowData["浜у搧鍚嶇О"] || rowData["鐗╂枡鍚嶇О"] || "",
+ "HMaterSpec": rowData["瑙勬牸鍨嬪彿"] || "",
+ "HUnitID": rowData.HUnitID || 0,
+ "HUnitCode": rowData["璁￠噺鍗曚綅浠ｇ爜"] || "",
+ "HUnitName": rowData["璁￠噺鍗曚綅"] || "",
+ "HQtyMust": parseFloat(rowData["鐢熶骇浠诲姟鍗曟暟閲�"] || rowData["璁″垝鐢熶骇鏁伴噺"] || 0),
+ "HQty": parseFloat(rowData["鐢熶骇浠诲姟鍗曟暟閲�"] || rowData["璁″垝鐢熶骇鏁伴噺"] || 0), // 榛樿瀹炲彂鏁伴噺绛変簬搴斿彂鏁伴噺
+ "HPrice": 0,
+ "HMoney": 0,
+ "HWHID": $("#HWHID").val() || 0,
+ "HWHCode": "",
+ "HWHName": $("#HWHName").val() || "",
+ "HRemark": rowData["搴曢儴澶囨敞"] || rowData["琛ㄥご澶囨敞"] || "",
+ // 鍙互娣诲姞婧愬崟淇℃伅瀛楁
+ "HSourceInterID": rowData.hmainid || 0,
+ "HSourceEntryID": rowData.hsubid || 0,
+ "HSourceBillNo": rowData["鍗曟嵁鍙�"] || "",
+ "HSourceBillType": "3710"
+ };
+
+ // 灏嗘柊琛岃拷鍔犲埌瀛愯〃
+ currentData.push(newRow);
+ addedCount++;
+ }
+
+ // 鏇存柊琛ㄦ牸缂撳瓨鍜屾暟鎹�
+ table.cache["mainTable"] = currentData;
+ option.data = currentData;
+
+ // 閲嶆柊娓叉煋琛ㄦ牸
+ table.render(option);
+
+ // 婊氬姩鍒板簳閮ㄦ樉绀烘柊娣诲姞鐨勮
+ setTimeout(function () {
+ var $tableBody = $('#mainTable').next('.layui-table-view').find('.layui-table-body');
+ $tableBody.scrollTop($tableBody[0].scrollHeight);
+ }, 100);
+
+ layer.msg('鎴愬姛娣诲姞' + addedCount + '琛屾暟鎹�');
+ }
//淇濆瓨
form.on('submit(Saver)', function (data) {
var refSav = "";
@@ -597,7 +744,7 @@
var sMainStr = JSON.stringify(data.field);
var sSubStr = JSON.stringify(table.cache['mainTable']);
var sMainSub = sMainStr + ';' + sSubStr + ';' + refSav + ';' + sessionStorage["HUserName"];
-
+ console.log("婧愬崟绫诲瀷", $("#HBillSubType").val());
if (!AllowLoadData(sSubStr))//鏁版嵁楠岃瘉
{
return false;
@@ -780,6 +927,8 @@
, { field: 'HWHCode', title: '鍙戞枡浠撳簱浠ｇ爜', edit: 'text', event: 'HWHCode', width: 120 }
, { field: 'HWHName', title: '鍙戞枡浠撳簱鍚嶇О', edit: 'text', width: 120 }
, { field: 'HRemark', title: '澶囨敞', edit: 'text', width: 100 }
+ , { field: 'HSourceBillNo', title: '婧愬崟鍙�', width: 100 }
+ , { field: 'HSourceInterID', title: 'HSourceInterID', width: 100, hide: true }
, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
];
option = {
@@ -794,12 +943,15 @@
, done: function (res, curr, count) {
}
};
+ option.data = [];
+ table.render(option);
}
//鏃犳簮鍗曟柊澧�
function set_AddFNew() {
//鑾峰彇鏈�澶у崟鎹彿
get_MAXNum();
- option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HRemark": "" }];
+ option.data = [];
+ //option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HRemark": "" }];
table.render(option);
}
//鑾峰彇鏈�澶у崟鎹彿
@@ -824,7 +976,7 @@
function set_EditFromGrid(linterid) {
set_EditForm(linterid); //缂栬緫鑾峰彇琛ㄥご
set_EditGrid(linterid); //缂栬緫鑾峰彇琛ㄤ綋
- option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HRemark": "" }];
+ //option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HRemark": "" }];
table.render(option);
}
//缂栬緫鑾峰彇琛ㄥご
@@ -844,7 +996,10 @@
, "HDate": formatDate(data[0]["鏃ユ湡"])
//, "HInnerBillNo": data.鍐呴儴鍗曟嵁鍙�
, "HWHID": data[0]["HWHIDMain"] //浠撳簱ID
+ , "HSourceInterID": data[0]["HSourceInterID"] //浠撳簱ID
+ , "HSourceBillNo": data[0]["HSourceBillNo"] //浠撳簱ID
, "HWHName": data[0]["浠撳簱"] //浠撳簱鍚嶇О
+ , "HBillSubType": data[0]["HBillSubType"] //浠撳簱鍚嶇О
, "HSecManagerID": data[0]["hsecmanagerid"] //楠屾敹鍛業D
, "HSecManagerName": data[0]["棰嗘枡鍛�"] //楠屾敹鍛樺悕绉�
, "HKeeperID": data[0]["hkeeperid"] //淇濈鍛業D
@@ -853,7 +1008,7 @@
, "HMangerName": data[0]["涓荤"] //淇濈鍛樺悕绉�
, "HDeptID": data[0]["HDeptID"] //閮ㄩ棬ID
, "HDeptName": data[0]["閮ㄩ棬"] //閮ㄩ棬鍚嶇О
- , "HSourceBillType": data[0]["婧愬崟绫诲瀷"] //婧愬崟绫诲瀷
+ , "HSourceBillType": data[0]["HSourceBillType"] //婧愬崟绫诲瀷
, "XDH": "" //閫夊崟鍙�
, "HRemark": data[0]["琛ㄥご澶囨敞"] //澶囨敞
});
--
Gitblit v1.9.1