Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.jsp
===================================================================
diff -u -r39398 -r39836
--- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.jsp (.../foreignTousseApplicationView.jsp) (revision 39398)
+++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.jsp (.../foreignTousseApplicationView.jsp) (revision 39836)
@@ -106,6 +106,12 @@
SSTS_ForeignTousseApplication_Return = false;
+ //ZSWY-256:外来器械包提前归还
+ var SSTS_ForeignTousseApplication_EarlyReturn = true;
+
+ SSTS_ForeignTousseApplication_EarlyReturn = false;
+
+
//外来器械申请单收费设置
var SSTS_ShowForeignTousseApplication_ChargeSet = true;
Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js
===================================================================
diff -u -r39469 -r39836
--- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js (.../foreignTousseInfoForm.js) (revision 39469)
+++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js (.../foreignTousseInfoForm.js) (revision 39836)
@@ -2305,12 +2305,16 @@
var disableReturn = true;
//是否禁用“提前归还”按钮
var disableEarlyReturn = true;
- if(id && !SSTS_ForeignTousseApplication_Return){
+ if(id && (!SSTS_ForeignTousseApplication_Return || !SSTS_ForeignTousseApplication_EarlyReturn)){
DWREngine.setAsync(false);
ForeignTousseApplicationTableManager.isForeignTousseCanReturn(id,function(result){
var json = JSON.parse(result);
- disableReturn = json.disableReturn;
- disableEarlyReturn = json.disableEarlyReturn;
+ if(!SSTS_ForeignTousseApplication_Return){
+ disableReturn = json.disableReturn;
+ }
+ if(!SSTS_ForeignTousseApplication_EarlyReturn){
+ disableEarlyReturn = json.disableEarlyReturn;
+ }
});
DWREngine.setAsync(true);
}
Index: ssts-web/src/main/resources/systemset/operationDefine.xml
===================================================================
diff -u -r39708 -r39836
--- ssts-web/src/main/resources/systemset/operationDefine.xml (.../operationDefine.xml) (revision 39708)
+++ ssts-web/src/main/resources/systemset/operationDefine.xml (.../operationDefine.xml) (revision 39836)
@@ -26,7 +26,7 @@
-
+
Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.js
===================================================================
diff -u -r39806 -r39836
--- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.js (.../foreignTousseApplicationView.js) (revision 39806)
+++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.js (.../foreignTousseApplicationView.js) (revision 39836)
@@ -614,11 +614,11 @@
})
}
- if (!SSTS_ForeignTousseApplication_Return) {
+ if (!SSTS_ForeignTousseApplication_EarlyReturn) {
tbar.push('-', {
text: '批量提前归还',
iconCls: 'btn_ext_application_go',
- hidden: SSTS_ForeignTousseApplication_Return,
+ hidden: SSTS_ForeignTousseApplication_EarlyReturn,
handler: function () {
var records = grid.getSelectionModel().getSelections();
if (records.length == 0) {
Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp
===================================================================
diff -u -r39676 -r39836
--- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp (.../goodsApplicationView.jsp) (revision 39676)
+++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp (.../goodsApplicationView.jsp) (revision 39836)
@@ -462,6 +462,12 @@
SSTS_ForeignTousseApplication_Return = false;
+//ZSWY-256:外来器械包提前归还
+var SSTS_ForeignTousseApplication_EarlyReturn = true;
+
+ SSTS_ForeignTousseApplication_EarlyReturn = false;
+
+
//查看拍摄图片/视频
var SSTS_ShowCameraPhotoAndVideo = false;