Index: ssts-web/src/main/webapp/disinfectsystem/equipmentInspection/forminstanceForm.js
===================================================================
diff -u -r41070 -r41127
--- ssts-web/src/main/webapp/disinfectsystem/equipmentInspection/forminstanceForm.js (.../forminstanceForm.js) (revision 41070)
+++ ssts-web/src/main/webapp/disinfectsystem/equipmentInspection/forminstanceForm.js (.../forminstanceForm.js) (revision 41127)
@@ -310,7 +310,12 @@
});
}
+function isLoadIframe(){
+ return true
+}
+
Ext.onReady(function () {
addFormInstanceWin(id)
loadPage();
});
+
Index: ssts-web/src/main/webapp/disinfectsystem/equipmentInspection/forminstanceView.js
===================================================================
diff -u -r40949 -r41127
--- ssts-web/src/main/webapp/disinfectsystem/equipmentInspection/forminstanceView.js (.../forminstanceView.js) (revision 40949)
+++ ssts-web/src/main/webapp/disinfectsystem/equipmentInspection/forminstanceView.js (.../forminstanceView.js) (revision 41127)
@@ -9,7 +9,9 @@
grid: grid,
url: WWWROOT + '/disinfectsystem/equipmentInspection/forminstanceForm.jsp?id=' + data['id']
}
- getFormByIframeUtil(params);
+ getFormByIframeUtil(params, function (contentWindow) {
+ contentWindow.setLogonUserInfo(userName, userFullName);
+ });
}
// 删除
function deleteFormInstance(grid) {
@@ -123,7 +125,9 @@
grid: grid,
url: WWWROOT + '/disinfectsystem/equipmentInspection/forminstanceForm.jsp'
}
- getFormByIframeUtil(params);
+ getFormByIframeUtil(params, function (contentWindow) {
+ contentWindow.setLogonUserInfo(userName, userFullName);
+ });
}
}, '-', {
text: '删除',
Index: ssts-web/src/main/webapp/disinfectsystem/equipmentInspection/formdefinitionForm.js
===================================================================
diff -u -r41067 -r41127
--- ssts-web/src/main/webapp/disinfectsystem/equipmentInspection/formdefinitionForm.js (.../formdefinitionForm.js) (revision 41067)
+++ ssts-web/src/main/webapp/disinfectsystem/equipmentInspection/formdefinitionForm.js (.../formdefinitionForm.js) (revision 41127)
@@ -51,12 +51,26 @@
}
});
Ext.getCmp('applicableEquipmentArray').setValue(JSON.stringify(item));
+ }else {
+ var applicableEquipmentArray = Ext.getCmp('applicableEquipmentArray').getValue();
+ if(applicableEquipmentArray !== ''){
+ applicableEquipmentArray = JSON.parse(applicableEquipmentArray);
+ deviceInfoStore.each(function (record) {
+ applicableEquipmentArray.forEach(function(item){
+ if (record.get('id') == item.equipmentId) {
+ record.set('checked',true)
+ }
+ })
+ });
+ }
}
}
}
}
});
- deviceInfoStore.load();
+ setTimeout(function(){
+ deviceInfoStore.load();
+ }, 600);
var remindUserStore = new Ext.data.Store({
proxy: new Ext.data.HttpProxy({
Index: ssts-web/src/main/webapp/disinfectsystem/equipmentInspection/forminstanceView.jsp
===================================================================
diff -u -r40949 -r41127
--- ssts-web/src/main/webapp/disinfectsystem/equipmentInspection/forminstanceView.jsp (.../forminstanceView.jsp) (revision 40949)
+++ ssts-web/src/main/webapp/disinfectsystem/equipmentInspection/forminstanceView.jsp (.../forminstanceView.jsp) (revision 41127)
@@ -3,7 +3,8 @@
<%@ include file="/common/taglibs.jsp"%>
<%
- request.setAttribute("userName",AcegiHelper.getLoginUser().getUserFullName());
+ request.setAttribute("userFullName",AcegiHelper.getLoginUser().getUserFullName());
+ request.setAttribute("userName",AcegiHelper.getLoginUser().getUserName());
%>
@@ -14,6 +15,7 @@
<%@ include file="/common/includeExtJsAndCss.jsp"%>