From 3f6124bd7baa730276b1980adb4d0c21f30caf3c Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期一, 27 五月 2024 16:17:11 +0800
Subject: [PATCH] 设备保养记录单维护 新增/编辑 时,表头 保养计划编号 未回显, 选择保养计划编号 后,子表保养项信息 未显示 工序进站接收单维护 打开编辑页面后,点击审核 报错 工序出站汇报单维护 打开编辑页面后,点击审核 报错
---
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBill.html | 4 ++--
WebTM/views/车间管理/工序进站接收单/Cj_StationInBill.html | 4 ++--
WebTM/WebTM.csproj | 2 +-
WebTM/views/设备管理/Sb_EquipMaintainBillEdit.html | 9 ++++++---
4 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index e46f5e2..970386a 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -1449,7 +1449,6 @@
<Content Include="views\妯℃不鍏风鐞哱鍣ㄥ叿鐐规瑙勭▼鍗昞Sc_MouldDotCheckRuleBillList.html" />
<Content Include="views\妯℃不鍏风鐞哱鍣ㄥ叿缁翠慨娲惧伐鍗昞Sc_MouldRepairSendWorkBillEdit.html" />
<Content Include="views\妯℃不鍏风鐞哱鍣ㄥ叿缁翠慨娲惧伐鍗昞Sc_MouldRepairSendWorkBillList.html" />
- <Content Include="views\妯℃不鍏风鐞哱妯″叿澶勭悊鍑哄簱鍗昞Sc_MouldScrapOutBill_PDA.html" />
<Content Include="views\妯℃不鍏风鐞哱妯″叿瀵垮懡璋冩暣鍗昞Sc_MouldLifeChangeBill_PDA.html" />
<Content Include="views\妯℃不鍏风鐞哱妯″叿鏀瑰埗鍏ュ簱鍗昞Sc_MouldRepairInBill_PDA.html" />
<Content Include="views\妯℃不鍏风鐞哱妯″叿鏀瑰埗鍑哄簱鍗昞Sc_MouldRepairOutBill_PDA.html" />
@@ -2483,6 +2482,7 @@
<Folder Include="Files\" />
<Folder Include="views\浠撳瓨绠＄悊\璋冩嫧鍗曟牳瀵筡" />
<Folder Include="views\浠撳瓨绠＄悊\璋冩嫧鍗曠ń鏍竆" />
+ <Folder Include="views\妯℃不鍏风鐞哱妯″叿澶勭悊鍑哄簱鍗昞" />
</ItemGroup>
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillEdit.html"
index f83c225..85264a9 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillEdit.html"
@@ -82,7 +82,7 @@
<input type="hidden" name="HEquipMaintainPlanEntryID" id="HEquipMaintainPlanEntryID" class="layui-input" value="0" style="float:left;width:150px;">
<input type="hidden" name="HEquipMaintainPlanInterID" id="HEquipMaintainPlanInterID" class="layui-input" value="0" style="float:left;width:150px;">
<input type="text" name="HPlanName" id="HPlanName" class="layui-input" value="" style="float:left;width:150px;background-color:#efefef4d;" readonly">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="HPlanList" style="width:40px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HPlanList" id="HPlanList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
</div>
@@ -527,7 +527,7 @@
//閫夋嫨淇濆吇璁″垝婧愬崟鐨勬椂鍊欏甫鍑烘暟鎹�
function get_MaintainItem3() {
- var HPlanID = $("#HPlanNo").val() //淇濆吇璁″垝ID
+ var HPlanID = $("#HEquipMaintainPlanInterID").val() //淇濆吇璁″垝ID
var HDate = $("#HDate").val(); //褰撳ぉ鏃ユ湡
$.ajax({
@@ -612,7 +612,7 @@
return layer.msg('璇烽�夋嫨鏁版嵁');
}
$("#HPlanName").val(checkStatus.data[0].鍗曟嵁鍙�);
- $("#HPlanNo").val(checkStatus.data[0].hmainid);
+ $("#HPlanNo").val(checkStatus.data[0].鍗曟嵁鍙�);
$("#HEquipMaintainPlanInterID").val(checkStatus.data[0].hmainid);
$("#HEquipName").val(checkStatus.data[0].璁惧鍚嶇О);
$("#HEquipID").val(checkStatus.data[0].HEquipID);
@@ -829,6 +829,8 @@
}
//缂栬緫
function set_EditFromGrid(linterid) {
+ //绂佹閫夋嫨
+ $('#HPlanList').addClass("layui-btn-disabled").attr("disabled", true);
set_EditForm(linterid); //缂栬緫鑾峰彇琛ㄥご
set_EditGrid(linterid); //缂栬緫鑾峰彇琛ㄤ綋
option.data = [{ "HMaintainItemID": 0, "HMaintainItemNumber": " ", "HMaintainItem": " ", "HMaintainPart": " ", "HClaim": " ", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HRemark": " " }];
@@ -860,6 +862,7 @@
, "HEndDate": data.缁撴潫鏃ユ湡 //
, "HPlanName": data.淇濆吇璁″垝
, "HPlanNo": data.淇濆吇璁″垝缂栧彿 //
+ , "HPlanName": data.淇濆吇璁″垝缂栧彿 //
, "HRemark": data.琛ㄥご澶囨敞 //澶囨敞
, "HEquipMaintainRuleInterID": data.HEquipMaintainRuleInterID //澶囨敞
, "HEquipMaintainRuleInterNo": data.璁惧淇濆吇瑙勭▼ //澶囨敞
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html"
index 4df54fc..b057258 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html"
@@ -1952,7 +1952,7 @@
$.ajax({
type: "GET",
url: GetWEBURL() + "/Cj_StationOutBill/set_CheckBill",
- data: { "HInterID": linterid, "CurUserName": sessionStorage["HUserName"] },
+ data: { "HInterID": linterid, "CurUserName": sessionStorage["HUserName"], "HBillSubType": "3791"},
success: function (result) {
if (result.count == 1) {
layer.alert(result.Message, { icon: 6 });
@@ -1983,7 +1983,7 @@
$.ajax({
type: "GET",
url: GetWEBURL() + "/Cj_StationOutBill/set_AbandonCheck",
- data: { "HInterID": linterid, "CurUserName": sessionStorage["HUserName"] },
+ data: { "HInterID": linterid, "CurUserName": sessionStorage["HUserName"], "HBillSubType": "3791"},
success: function (result) {
if (result.count == 1) {
layer.alert(result.Message, { icon: 6 });
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill.html"
index ae96cf7..4e4a0eb 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill.html"
@@ -747,7 +747,7 @@
$.ajax({
type: "GET",
url: GetWEBURL() + "/Cj_StationInBill/set_CheckBill",
- data: { "HInterID": linterid, "CurUserName": sessionStorage["HUserName"] },
+ data: { "HInterID": linterid, "CurUserName": sessionStorage["HUserName"], "HBillSubType":"3792" },
success: function (result) {
if (result.count == 1) {
layer.alert(result.Message, { icon: 6 });
@@ -771,7 +771,7 @@
$.ajax({
type: "GET",
url: GetWEBURL() + "/Cj_StationInBill/set_AbandonCheck",
- data: { "HInterID": linterid, "CurUserName": sessionStorage["HUserName"] },
+ data: { "HInterID": linterid, "CurUserName": sessionStorage["HUserName"], "HBillSubType": "3792"},
success: function (result) {
if (result.count == 1) {
layer.alert(result.Message, { icon: 6 });
--
Gitblit v1.9.1