Index: ssts-web/src/main/resources/systemset/operationDefine.xml
===================================================================
diff -u -r21579 -r21949
--- ssts-web/src/main/resources/systemset/operationDefine.xml (.../operationDefine.xml) (revision 21579)
+++ ssts-web/src/main/resources/systemset/operationDefine.xml (.../operationDefine.xml) (revision 21949)
@@ -227,6 +227,7 @@
+
Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsGodownEntryForm.js
===================================================================
diff -u -r21894 -r21949
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsGodownEntryForm.js (.../expensiveGoodsGodownEntryForm.js) (revision 21894)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsGodownEntryForm.js (.../expensiveGoodsGodownEntryForm.js) (revision 21949)
@@ -1094,7 +1094,7 @@
}
},*/{
text : '预验收',
- hidden:saveButton || (commonEntry.isOpen()?false:true),
+ hidden: SSTS_ExpensiveGoodsGodownEntry_PrepareCheck || (commonEntry.isOpen()?false:true),
handler : function() {
var id = top.Ext.getCmp('id').getValue();
form.form.submit( {
Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsGodownEntryView.jsp
===================================================================
diff -u -r21777 -r21949
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsGodownEntryView.jsp (.../expensiveGoodsGodownEntryView.jsp) (revision 21777)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsGodownEntryView.jsp (.../expensiveGoodsGodownEntryView.jsp) (revision 21949)
@@ -89,6 +89,11 @@
SSTS_ExpensiveGoodsPrepareGodownEntry_Delete = false;
+ var SSTS_ExpensiveGoodsGodownEntry_PrepareCheck = true;
+
+ SSTS_ExpensiveGoodsGodownEntry_PrepareCheck = false;
+
+
var saveButton = SSTS_ExpensiveGoodsPrepareGodownEntry_Create && SSTS_ExpensiveGoodsPurchaseGodownEntry_Create;
//验收状态数组