From 62180eee1845f0ac95cf8106e7b771d0248faf92 Mon Sep 17 00:00:00 2001
From: llj <132905093+newwwwwwtree@users.noreply.github.com>
Date: 星期六, 28 二月 2026 11:29:54 +0800
Subject: [PATCH] 修复生产汇报单，生产入库单
---
WebTM/views/生产管理/生产汇报单/Sc_Add_ICMOReportBillList.html | 24 +++++++++++++++++++++++-
WebTM/views/验收入库/产品入库/Kf_ProductInBillEdit.html | 34 +++++++++++++++++++++-------------
2 files changed, 44 insertions(+), 14 deletions(-)
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_Add_ICMOReportBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_Add_ICMOReportBillList.html"
index e497d67..66aecb5 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_Add_ICMOReportBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_Add_ICMOReportBillList.html"
@@ -36,7 +36,7 @@
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_AddNew" id="set_AddNew">鏂板</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_CopyBill" id="set_CopyBill">澶嶅埗</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_CheckBill" id="set_CheckBill">瀹℃牳</button>
- <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_AbandonCheck" id="set_AbandonCheck">鍙嶅鏍�</button>
+ <!--<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_AbandonCheck" id="set_AbandonCheck">鍙嶅鏍�</button>-->
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_DeleteBill" id="set_DeleteBill">鍒犻櫎</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="get_PrintReport" id="get_PrintReport">鎵撳嵃</button>
<button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
@@ -740,6 +740,8 @@
success: function (result) {
if (result.count == 1) {
HIsCheck = true;
+ $('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);
+
layer.msg(result.Message, { time: 1 * 10000, icon: 1 }, function () {
// 寰楀埌frame绱㈠紩
var index = layer.getFrameIndex(window.name);
@@ -1240,6 +1242,26 @@
$("#HMainSourceEntryID").val(data.HMainSourceEntryID == null ? 0 : data.HMainSourceEntryID);
$("#HExplanation").val("");
$("#HRemark").val(data.琛ㄥご澶囨敞);
+ $("#HMaker").val(data.鍒跺崟浜� || "");
+ $("#HMakeDate").val(data.鍒跺崟鏃ユ湡 ? formatDate(data.鍒跺崟鏃ユ湡) : "");
+ $("#HChecker").val(data.瀹℃牳浜� || "");
+ $("#HCheckDate").val(data.瀹℃牳鏃ユ湡 ? formatDate(data.瀹℃牳鏃ユ湡) : "");
+ $("#HUpDater").val(data.淇敼浜� || "");
+ $("#HUpDateDate").val(data.淇敼鏃ユ湡 ? formatDate(data.淇敼鏃ユ湡) : "");
+ $("#HCloseMan").val(data.鍏抽棴浜� || "");
+ $("#HCloseDate").val(data.鍏抽棴鏃ユ湡 ? formatDate(data.鍏抽棴鏃ユ湡) : "");
+ $("#HDeleteMan").val(data.浣滃簾浜� || "");
+ $("#HDeleteDate").val(data.浣滃簾鏃ユ湡 ? formatDate(data.浣滃簾鏃ユ湡) : "");
+ if (data.瀹℃牳浜� && data.瀹℃牳浜�.trim() !== "") {
+
+ $('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);
+ $('#get_PrintReport').removeClass("layui-btn-disabled").attr("disabled", false);
+ HIsCheck = true;
+ } else {
+ $('#set_CheckBill').removeClass("layui-btn-disabled").attr("disabled", false);
+ $('#get_PrintReport').addClass("layui-btn-disabled").attr("disabled", true);
+ HIsCheck = false;
+ }
PicUpload();
get_file();
} else {
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBillEdit.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBillEdit.html"
index 38ed6cc..ef13731 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBillEdit.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBillEdit.html"
@@ -807,10 +807,10 @@
if (OperationType == 1 || OperationType == 4) {
if ($("#HSourceBillType").val() == "3710") {
- for (var i = 0; i < option.data.length; i++) {
+ for (var i = 0; i < option.data.length; i++) {
+ var tableData = table.cache["mainTable"];
var HSourceBillData = "";
- var HSourceBillData = getPushSource_ICMOBillInit(option.data[i].HSourceInterID, option.data[i].HSourceEntryID); //鑾峰彇婧愬崟鏁版嵁
- if (HSourceBillData != "none") {
+ var HSourceBillData = getPushSource_ICMOBillInit(tableData[i].HSourceInterID, tableData[i].HSourceEntryID); if (HSourceBillData != "none") {
if (HSourceBillData == null) {
layer.alert("淇濆瓨澶辫触!绗�" + (i + 1) + "琛岋細鏈煡璇㈠埌婧愬崟鍗曟嵁!", { icon: 5 });
return;
@@ -1091,7 +1091,7 @@
success: function (data) {
if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
layer.msg(data.Message, { icon: 1 });
- $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);
+ $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
//淇濆瓨鍚庢祻瑙�
//ReRoadBillMain();
}
@@ -1517,7 +1517,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse.html?Type=' +"Warehouse", 'yes']
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -1534,12 +1534,12 @@
})
layer.close(index);//鍏抽棴寮圭獥
}
- , end: function () {
- obj.update({
- "HWHID": OptionData.HItemID
- , "鏀舵枡浠撳簱": OptionData.浠撳簱鍚嶇О
- })
- }
+ // , end: function () {
+ // obj.update({
+ // "HWHID": OptionData.HItemID
+ // , "鏀舵枡浠撳簱": OptionData.浠撳簱鍚嶇О
+ // })
+ //}
})
}
//杈呭姪璁￠噺鍗曚綅
@@ -1857,7 +1857,14 @@
$("#HKeeperName").val(obj[0].鑱屽憳鍚嶇О);
$("#HKeeperID").val(obj[0].HItemID);
}
+
+ function GetGyCur(obj) //杩斿洖甯佸埆
+ {
+ $("#HCurName").val(obj.璐у竵鍚嶇О);
+ $("#HCurID").val(obj.HItemID);
+ $("#HExRate").val(obj.姹囩巼);
+ }
function GetHWHValue(obj) //杩斿洖浠撳簱
{
$("#HWHName").val(obj[0].浠撳簱鍚嶇О);
@@ -1880,8 +1887,9 @@
}
//鍙屽嚮杩斿洖鏀舵枡浠撳簱
- function GetGyWarehouse(data) {
- OptionData = data
+ function GetGyWarehouse(data) {
+ option.data = data
+ //OptionData = data
}
//鍙屽嚮杩斿洖杈呭姪灞炴��
function GetGyProperty(data) {
--
Gitblit v1.9.1