From 8a904326ee26934bf9b68164dd2c42804223e923 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期三, 05 六月 2024 09:52:59 +0800
Subject: [PATCH] 开工单，完工单保存失败后关闭页面屏障，设备保养计划单选保养规程带出保养级别为空判断
---
WebTM/Files/SOP/ZYZD00000313/CMR-RD-SOP-P136-01烘料-A2_20240112_肖水清.pdf | 0
WebTM/views/生产管理/生产停工单/Sc_Add_MESStopWorkBillList.html | 2 ++
WebTM/views/设备管理/Sb_EquipMaintainPlanBillEdit.html | 2 +-
WebTM/views/生产管理/生产完工单/Sc_Add_MESEndWorkBillList.html | 2 ++
WebTM/Files/SOP/ZYZD00000314/CMR-RD-SOP-P136-02注塑-A5_20240423_周芳.pdf | 0
5 files changed, 5 insertions(+), 1 deletions(-)
diff --git "a/WebTM/Files/SOP/ZYZD00000313/CMR-RD-SOP-P136-01\347\203\230\346\226\231-A2_20240112_\350\202\226\346\260\264\346\270\205.pdf" "b/WebTM/Files/SOP/ZYZD00000313/CMR-RD-SOP-P136-01\347\203\230\346\226\231-A2_20240112_\350\202\226\346\260\264\346\270\205.pdf"
new file mode 100644
index 0000000..065d116
--- /dev/null
+++ "b/WebTM/Files/SOP/ZYZD00000313/CMR-RD-SOP-P136-01\347\203\230\346\226\231-A2_20240112_\350\202\226\346\260\264\346\270\205.pdf"
Binary files differ
diff --git "a/WebTM/Files/SOP/ZYZD00000314/CMR-RD-SOP-P136-02\346\263\250\345\241\221-A5_20240423_\345\221\250\350\212\263.pdf" "b/WebTM/Files/SOP/ZYZD00000314/CMR-RD-SOP-P136-02\346\263\250\345\241\221-A5_20240423_\345\221\250\350\212\263.pdf"
new file mode 100644
index 0000000..5407b93
--- /dev/null
+++ "b/WebTM/Files/SOP/ZYZD00000314/CMR-RD-SOP-P136-02\346\263\250\345\241\221-A5_20240423_\345\221\250\350\212\263.pdf"
Binary files differ
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\201\234\345\267\245\345\215\225/Sc_Add_MESStopWorkBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\201\234\345\267\245\345\215\225/Sc_Add_MESStopWorkBillList.html"
index 632f839..4a72256 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\201\234\345\267\245\345\215\225/Sc_Add_MESStopWorkBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\201\234\345\267\245\345\215\225/Sc_Add_MESStopWorkBillList.html"
@@ -660,10 +660,12 @@
//});
}
else {
+ layer.close(index);
layer.alert(data.Message, { icon: 5 })
}
},
error: function (err) {
+ layer.close(index);
layer.alert(err, { icon: 5 })
}
})
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\256\214\345\267\245\345\215\225/Sc_Add_MESEndWorkBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\256\214\345\267\245\345\215\225/Sc_Add_MESEndWorkBillList.html"
index 8f5008a..1d99ef2 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\256\214\345\267\245\345\215\225/Sc_Add_MESEndWorkBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\256\214\345\267\245\345\215\225/Sc_Add_MESEndWorkBillList.html"
@@ -829,10 +829,12 @@
//});
}
else {
+ layer.close(index);
layer.alert(data.Message, { icon: 5 })
}
},
error: function (err) {
+ layer.close(index);
layer.alert(err, { icon: 5 })
}
})
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainPlanBillEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainPlanBillEdit.html"
index d013651..1a4c276 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainPlanBillEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainPlanBillEdit.html"
@@ -415,7 +415,7 @@
$("#HCycleUnit").val(checkStatus.data[0].鍛ㄦ湡鍗曚綅);
$("#HCheckCycle").val(checkStatus.data[0].淇濆吇鍛ㄦ湡);
$("#HMaintainLevName").val(checkStatus.data[0].淇濆吇绾у埆鍚嶇О);
- $("#HMaintainLevID").val(checkStatus.data[0].HMaintainLevID);
+ $("#HMaintainLevID").val(checkStatus.data[0].HMaintainLevID == null ? 0 : checkStatus.data[0].HMaintainLevID);
get_DocCheckItem2(checkStatus.data[0].hmainid);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
--
Gitblit v1.9.1