Index: ssts-web/src/main/webapp/homepage/menu.jsp
===================================================================
diff -u -r22147 -r22149
--- ssts-web/src/main/webapp/homepage/menu.jsp (.../menu.jsp) (revision 22147)
+++ ssts-web/src/main/webapp/homepage/menu.jsp (.../menu.jsp) (revision 22149)
@@ -1127,6 +1127,12 @@
SSTS_ExpensiveGoodsPrepareGodownEntry_Hidden_Manager = false;
+//高值耗材退库管理
+var SSTS_ExpensiveGoodsGodownOutEntryManagement_Hidden_Menu = true;
+
+SSTS_ExpensiveGoodsGodownOutEntryManagement_Hidden_Menu = false;
+
+
/* 高值耗材 */
/**
Index: ssts-web/src/main/webapp/homepage/menuconfigure.js
===================================================================
diff -u -r22147 -r22149
--- ssts-web/src/main/webapp/homepage/menuconfigure.js (.../menuconfigure.js) (revision 22147)
+++ ssts-web/src/main/webapp/homepage/menuconfigure.js (.../menuconfigure.js) (revision 22149)
@@ -338,7 +338,7 @@
//{hidden :SSTS_ExpensiveGoods_Hidden_Menu,text:"高值耗材出入库记录",href:WWWROOT+'/disinfectsystem/assestManagement/expensiveGoods/storageRecordView.jsp',hrefTarget:linkTarget,leaf:true},
{hidden :SSTS_ExpensiveGoods_Hidden_Menu || SSTS_ExpensiveGoodsPurchaseGodownEntry_Hidden_Manager,text:"高值耗材自购入库单管理",href:WWWROOT+'/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsGodownEntryView.jsp?entryType=' + entryTypePurchase,hrefTarget:linkTarget,leaf:true},
{hidden :SSTS_ExpensiveGoods_Hidden_Menu || SSTS_ExpensiveGoodsPrepareGodownEntry_Hidden_Manager,text:"高值耗材预入库单管理",href:WWWROOT+'/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsGodownEntryView.jsp?entryType=' + entryTypePrepareIn,hrefTarget:linkTarget,leaf:true},
- {hidden :SSTS_ExpensiveGoods_Hidden_Menu,text:"高值耗材退库单管理",href:WWWROOT+'/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsGodownOutEntryView.jsp',hrefTarget:linkTarget,leaf:true},
+ {hidden :SSTS_ExpensiveGoodsGodownOutEntryManagement_Hidden_Menu,text:"高值耗材退库单管理",href:WWWROOT+'/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsGodownOutEntryView.jsp',hrefTarget:linkTarget,leaf:true},
//{hidden :SSTS_ExpensiveGoods_Hidden_Menu,text:"高值耗材调拨单管理",href:WWWROOT+'/disinfectsystem/assestManagement/godownEntry/appropriationView.jsp',hrefTarget:linkTarget,leaf:true},
{hidden :SSTS_ExpensiveGoods_Hidden_Menu,text:"高值耗材盘盈盘亏管理",href:WWWROOT+'/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsGodownStockTakeView.jsp',hrefTarget:linkTarget,leaf:true},
{hidden :SSTS_ExpensiveGoods_Hidden_Menu,text:"高值耗材盘点管理",href:WWWROOT+'/disinfectsystem/stocktakerecordmanager/inventoryrecordView.jsp'+'?type=' + inventoryTypeCodeExpensiveGoods,hrefTarget:linkTarget,leaf:true},
Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsGodownOutEntryView.js
===================================================================
diff -u -r22113 -r22149
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsGodownOutEntryView.js (.../expensiveGoodsGodownOutEntryView.js) (revision 22113)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsGodownOutEntryView.js (.../expensiveGoodsGodownOutEntryView.js) (revision 22149)
@@ -664,130 +664,8 @@
})],
buttons : [
{
- text : '修改物品',
- hidden : !commonEntry.isOpen(),
- handler : function() {
- var store = top.Ext.getCmp('expensiveGoodsGodownEntryItemGrid').getStore();
- var modifyRecords = store.getModifiedRecords();
- var len = modifyRecords.length;
- var items = [];
- for (var i = 0; i < len; i++) {
- var record = modifyRecords[i];
- items.push({
- id : record.data.id,//退库明细id
- expensiveGoodsId : record.data.expensiveGoodsId,//一次性物品定义id
- expDate : record.data.expDate.format('Y-m-d'),//失效日期
- supplierName : record.data.supplierName,//供应商
- grade : record.data.grade//类别
- });
- }
- top.Ext.getCmp("items").setValue(JSON.stringify(items));
- form.form.submit({
- url : WWWROOT + '/disinfectSystem/expensiveGoodsGodownEntryAction!modifyExpensiveGoodsGodownEntryItemBaseData.do',
- method : 'POST',
- waitMsg : '正在保存数据，请稍候',
- waitTitle : '提交表单',
- success : function(form, action) {
- if(!isUndefinedOrNullOrEmpty(action.result.message)){
- showResult(action.result.message);
- return;
- }
- expensiveGoodsGodownEntryWin.close();
- grid.dwrReload();
- },
- failure : function(form, action) {
- alert(action.result.message);
- }
- });
- }
- },
- {
- text : '选择打印',
- handler : function() {
- if(!form.getForm().isValid()){
- showResult('请正确填写表单各值');
- return false;
- }
- var items = [];
- var records = top.Ext.getCmp('expensiveGoodsGodownEntryItemGrid').getSelectionModel().getSelections();
- if (records.length == 0) {
- showResult("请选择要打印的一次性物品！");
- return false;
- }
-
- for ( var i = 0, len = records.length; i < len; i++) {
- if(isUndefinedOrNullOrEmpty(records[i].data.id)){
- showResult(records[i].data.name + "未保存！请先保存再打印");
- return false;
- }
- items.push(records[i].data);
- }
- top.Ext.getCmp("items").setValue(JSON.stringify(items));
- form.form.submit({
- url : WWWROOT + '/disinfectSystem/expensiveGoodsGodownEntryAction!printSomeExpensiveGoodsGodownEntryItem.do',
- method : 'POST',
- waitMsg : '正在保存数据，请稍候',
- waitTitle : '提交表单',
- success : function(form, action) {
- if(!isUndefinedOrNullOrEmpty(action.result.errorMessage)){
- showResult(action.result.errorMessage);
- return;
- }
- Ext.getCmp("formSubmitResult").setValue(formSubmitResultSucc);
- expensiveGoodsGodownEntryWin.close();
- grid.dwrReload();
- //打印条码
- commonEntry.printBarcode(action.result.items,false);
-
- },
- failure : function(form, action) {
- showResult(action.failureType);
- Ext.getCmp("formSubmitResult").setValue(formSubmitResultFail);
- }
- });
- }
- },{
- text : '保存并打印新标签',
- hidden: true,
- handler : function() {
- if(!form.getForm().isValid()){
- showResult('请正确填写表单各值');
- return false;
- }
- var items = buildJSONStringFromStore(top.Ext.getCmp('expensiveGoodsGodownEntryItemGrid').getStore());
- top.Ext.getCmp("items").setValue(items);
- // items为json数组字符串，不会为null
- if(items == '[]'){
- showResult('请正确填写表单各值');
- return false;
- }
- form.form.submit({
- url : WWWROOT + '/disinfectSystem/expensiveGoodsGodownEntryAction!saveExpensiveGoodsGodownEntry.do',
- method : 'POST',
- params : {print : true},
- waitMsg : '正在保存数据，请稍候',
- waitTitle : '提交表单',
- success : function(form, action) {
- Ext.getCmp("formSubmitResult").setValue(formSubmitResultSucc);
- //保存返回的结果
- entryItemJsonArray = action.result.items;
- showResult(action.result.message);
- expensiveGoodsGodownEntryWin.close();
- grid.dwrReload();
-
- //打印条码
- //commonEntry.printBarcode(entryItemJsonArray,true);
-
- },
- failure : function(form, action) {
- showResult(action.result.message);
- Ext.getCmp("formSubmitResult").setValue(formSubmitResultFail);
- }
- });
- }
- },{
text : '保存',
- hidden:saveButton || (commonEntry.isOpen()?true:false),
+ hidden:saveButton || (commonEntry.isOpen()?true:false) || SSTS_ExpensiveGoodsGodownOutEntry_Update_Hidden_Menu,
handler : function() {
if(!form.getForm().isValid()){
showResult('请正确填写表单各值');
@@ -1119,7 +997,7 @@
//grid顶部工具栏,通过权限与配置项判定是否需要添加到工具栏
var tbar = [];
//添加
- if(!SSTS_ExpensiveGoodsPurchaseGodownEntry_Create){
+ if(!SSTS_ExpensiveGoodsGodownOutEntry_Create_Hidden_Menu){
tbar.push({
text : '添加',
iconCls : 'btn_ext_application_add',
@@ -1132,7 +1010,7 @@
}
tbar.push({
text : '查看',
- hidden : SSTS_ExpensiveGoodsPurchaseGodownEntry_Update,
+ hidden : SSTS_ExpensiveGoodsGodownOutEntry_Update_Hidden_Menu,
iconCls : 'btn_ext_application_edit',
id : 'editTbar',
handler : function() {
@@ -1143,7 +1021,7 @@
// 一键退库
tbar.push({
text : '一键退库',
- hidden : SSTS_ExpensiveGoodsPurchaseGodownEntry_Update,
+ hidden : SSTS_ExpensiveGoodsGodownOutEntry_Create_Hidden_Menu,
iconCls : 'btn_ext_application_edit',
id : 'editTbar',
handler : function() {
Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsGodownOutEntryView.jsp
===================================================================
diff -u -r20980 -r22149
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsGodownOutEntryView.jsp (.../expensiveGoodsGodownOutEntryView.jsp) (revision 20980)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsGodownOutEntryView.jsp (.../expensiveGoodsGodownOutEntryView.jsp) (revision 22149)
@@ -82,6 +82,21 @@
SSTS_ExpensiveGoodsPrepareGodownEntry_Delete = false;
+ ///
+ var SSTS_ExpensiveGoodsGodownOutEntry_Create_Hidden_Menu = true;
+
+ SSTS_ExpensiveGoodsGodownOutEntry_Create_Hidden_Menu = false;
+
+
+ var SSTS_ExpensiveGoodsGodownOutEntry_Update_Hidden_Menu = true;
+
+ SSTS_ExpensiveGoodsGodownOutEntry_Update_Hidden_Menu = false;
+
+
+ var SSTS_ExpensiveGoodsGodownOutEntry_Delete_Hidden_Menu = true;
+
+ SSTS_ExpensiveGoodsGodownOutEntry_Delete_Hidden_Menu = false;
+
var saveButton = SSTS_ExpensiveGoodsPrepareGodownEntry_Create && SSTS_ExpensiveGoodsPurchaseGodownEntry_Create;