Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceSign.jsp
===================================================================
diff -u -r13716 -r15102
--- ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceSign.jsp (.../invoiceSign.jsp) (revision 13716)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceSign.jsp (.../invoiceSign.jsp) (revision 15102)
@@ -41,9 +41,15 @@
function cancel(){
location.href = WWWROOT+'/homepage/portalPage.jsp';
}
-
+//true表示是从个人桌面点击进入,其他值都不是
+var fromdesktop = '${param.fromdesktop}';
$(document).ready(function() {
document.onkeydown = showKeyDown;
+ window.focus();
+ alert(fromdesktop);
+ if('true' == fromdesktop){
+ $('#return').hide();
+ }
});
//在页面无需将光标定位在输入框相应全局的扫描枪事件
var barcodeTemp = '';
Index: ssts-web/src/main/resources/systemset/portalPage.xml
===================================================================
diff -u -r15019 -r15102
--- ssts-web/src/main/resources/systemset/portalPage.xml (.../portalPage.xml) (revision 15019)
+++ ssts-web/src/main/resources/systemset/portalPage.xml (.../portalPage.xml) (revision 15102)
@@ -15,7 +15,7 @@
-
+