Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceDepartmentView.jsp
===================================================================
diff -u -r30509 -r40459
--- ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceDepartmentView.jsp (.../invoiceDepartmentView.jsp) (revision 30509)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceDepartmentView.jsp (.../invoiceDepartmentView.jsp) (revision 40459)
@@ -19,6 +19,7 @@
+
Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceDepartmentForm.js
===================================================================
diff -u -r30509 -r40459
--- ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceDepartmentForm.js (.../invoiceDepartmentForm.js) (revision 30509)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceDepartmentForm.js (.../invoiceDepartmentForm.js) (revision 40459)
@@ -24,7 +24,11 @@
top.Ext4.getCmp('shift').setValue(result.data.shift);
top.Ext4.getCmp('departCodes').setValue(result.data.departCodes);
top.Ext4.getCmp('departNames').setValue(result.data.departNames);
-
+ if (invoiceDepartmentView) {
+ top.Ext4.getCmp('handlerDepartCode').setValue(result.data.handlerDepartCode);
+ top.Ext4.getCmp('handlerDepartId').setValue(result.data.handlerDepartId);
+ top.Ext4.getCmp('handlerDepartName').setValue(result.data.handlerDepartName);
+ }
} else {
showResult('系统加载出错，请稍候再试');
}
@@ -94,15 +98,27 @@
}
function showWindow(id) {
+ var departInfoStore = new top.Ext4.data.Store({
+ proxy: {
+ type: 'ajax',
+ url: WWWROOT + '/disinfectSystem/baseData/supplyRoomConfigAction!getSupplyRoomOrgUnitList.do',
+ reader: {
+ type: 'json',
+ root: 'data'
+ }
+ },
+ fields: ["orgUnitCoding", "orgUnitName", "id"]
+ });
formPanel = new top.Ext4.form.Panel({
id: 'configForm',
frame: true,
labelSeparator: ':',
bodyStyle: 'padding:5px 5px 0px 5px;',
width: 800,
+ buttonAlign: 'center',
fieldDefaults: {
- labelAlign: 'left',
- labelWidth: 200
+ labelAlign: 'right',
+ labelWidth: 80
},
items: [{
xtype: 'hidden',
@@ -115,33 +131,27 @@
}, {
xtype: "fieldset",
title: '基础信息',
- height: 500,
+ height: 320,
items: [{
layout: 'column',
- labelWidth: 170,
+ border: 0,
items: [{
columnWidth: .8,
layout: 'form',
+ border: 0,
items: [{
xtype: 'textfield',
fieldLabel: '分组',
id: 'shift',
name: 'shift',
allowBlank: false,
anchor: '98%'
- }, {
- xtype: 'textarea',
- fieldLabel: '科室',
- id: 'departNames',
- name: 'departNames',
- height: 230,
- allowBlank: false,
- readOnly: true,
- anchor: '98%'
}]
}, {
columnWidth: .2,
layout: 'form',
+ border: 0,
+ style: 'margin-left:10px',
items: [{
xtype: 'button',
text: '选择科室',
@@ -153,10 +163,57 @@
}
}
}]
+ }, {
+ columnWidth: .8,
+ layout: 'form',
+ border: 0,
+ hidden: !invoiceDepartmentView,
+ items: [{
+ xtype: 'hidden',
+ id: 'handlerDepartId',
+ name: 'handlerDepartId'
+ }, {
+ xtype: 'hidden',
+ id: 'handlerDepartCode',
+ name: 'handlerDepartCode'
+ }, {
+ xtype: 'combo',
+ fieldLabel: '处理科室',
+ id: 'handlerDepartName',
+ name: 'handlerDepartName',
+ width: 120,
+ valueField: 'orgUnitName',
+ displayField: 'orgUnitName',
+ store: departInfoStore,
+ forceSelection: true,
+ editable: false,
+ triggerAction: 'all',
+ allowBlank: true,
+ anchor: '95%',
+ listeners: {
+ select: function (combo, record, index) {
+ top.Ext4.getCmp('handlerDepartCode').setValue(record[0].data.orgUnitCoding);
+ top.Ext4.getCmp('handlerDepartId').setValue(record[0].data.id);
+ }
+ }
+ }]
+ }, {
+ columnWidth: .8,
+ layout: 'form',
+ border: 0,
+ items: [{
+ xtype: 'textarea',
+ fieldLabel: '科室',
+ id: 'departNames',
+ name: 'departNames',
+ height: 230,
+ allowBlank: false,
+ readOnly: true,
+ anchor: '98%'
+ }]
}]
}]
- }]
- ,
+ }],
buttons: [{
id: 'saveBtn',
text: '保存',
@@ -179,7 +236,7 @@
layout: 'border',
title: '科室发货设置',
width: 800,
- height: 500,
+ height: 400,
border: false,
plain: true,
modal: true,
Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceDepartmentView.js
===================================================================
diff -u -r28930 -r40459
--- ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceDepartmentView.js (.../invoiceDepartmentView.js) (revision 28930)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceDepartmentView.js (.../invoiceDepartmentView.js) (revision 40459)
@@ -1,69 +1,78 @@
var grid;
+
+//FSEYEQ-19：数据隔离
+var invoiceDepartmentView = false;
+if (sstsConfig.supplyRoomDataIsolationModule && sstsConfig.supplyRoomDataIsolationModule.indexOf('invoiceDepartmentView') >= 0) {
+ invoiceDepartmentView = true;
+}
+
/**
* 修改记录
* modifyRecord函数 触发modify函数调用，并传入当前列的值以及record.data对象
* 页面中需要定义 modify(v,data) 函数
*/
-function modify(v,data){
+function modify(v, data) {
editConfig(data.id);
}
-function moveUp(number){
- if(number>1){
- InvoiceDepartmentTableManage.moveUpRecord(number,function(){
+function moveUp(number) {
+ if (number > 1) {
+ InvoiceDepartmentTableManage.moveUpRecord(number, function () {
grid.getStore().reload();
});
}
}
-function moveDown(number){
- InvoiceDepartmentTableManage.moveDownRecord(number,function(){
+function moveDown(number) {
+ InvoiceDepartmentTableManage.moveDownRecord(number, function () {
grid.getStore().reload();
});
}
-Ext.onReady(function() {
+Ext.onReady(function () {
Ext.QuickTips.init();
-
- function moveUpDown(v, p, record){
- var html = '';
- html += '
';
- html += '';
- html += '
';
- return html;
- }
-
+
+ function moveUpDown(v, p, record) {
+ var html = '';
+ html += ' ';
+ html += '';
+ html += '';
+ return html;
+ }
+
var columns = [
- {header : "标识号",dataIndex : 'id',hidden :true},
- {header : "分组",dataIndex : 'shift',width:100,renderer : modifyRecord},
- {header : "科室名称",dataIndex : 'departNames',width:900},
- {header : "科室代码",dataIndex : 'departCodes',hidden : true},
- {header : "排序操作",dataIndex : 'orderNum', renderer : moveUpDown, sortable: false, menuDisabled: true}
- ];
+ { header: "标识号", dataIndex: 'id', hidden: true },
+ { header: "分组", dataIndex: 'shift', width: 100, renderer: modifyRecord },
+ { header: "处理科室", dataIndex: 'handlerDepartName', sortable: false, hidden: !invoiceDepartmentView },
+ { header: "科室名称", dataIndex: 'departNames', width: 900 },
+ { header: "科室代码", dataIndex: 'departCodes', hidden: true },
+ { header: "排序操作", dataIndex: 'orderNum', renderer: moveUpDown, sortable: false, menuDisabled: true }
+ ];
var filters = new Ext.grid.GridFilters({
- filters : [
- {type:'string',dataIndex:'name'}
+ filters: [
+ { type: 'string', dataIndex: 'name' }
]
});
var readerDetail = [
- {name : 'id'},
- {name : 'shift'},
- {name : 'departNames'},
- {name : 'departCodes'},
- {name : 'orderNum'}
+ { name: 'id' },
+ { name: 'shift' },
+ { name: 'handlerDepartName' },
+ { name: 'departNames' },
+ { name: 'departCodes' },
+ { name: 'orderNum' }
];
-
+
var tbar = [{
- text : '添加',
- hidden : false,
- iconCls : 'btn_ext_application_add',
- handler : function() {
+ text: '添加',
+ hidden: false,
+ iconCls: 'btn_ext_application_add',
+ handler: function () {
showWindow();
}
- },'-',{
- text : '修改',
- hidden : false,
- iconCls : 'btn_ext_application_edit',
- handler : function() {
+ }, '-', {
+ text: '修改',
+ hidden: false,
+ iconCls: 'btn_ext_application_edit',
+ handler: function () {
var records = grid.getSelectionModel().getSelections();
if (records.length == 0) {
showResult("请选择要修改的数据！");
@@ -77,40 +86,40 @@
editConfig(id);
}
}, '-', {
- text : '删除',
- hidden : false,
- iconCls : 'btn_ext_application_del',
- handler : function() {
+ text: '删除',
+ hidden: false,
+ iconCls: 'btn_ext_application_del',
+ handler: function () {
deleteConfig(grid);
}
}];
var dwrCallParams = null;
- Ext.ux.ForgonPageGrid.prototype.getGridParameterMap = function() {};
+ Ext.ux.ForgonPageGrid.prototype.getGridParameterMap = function () { };
grid = new Ext.ux.ForgonPageGrid({
- tbar : tbar,
- pageSize : 20,
- defaultSortField : 'orderNum',
- defaultSortDirection : 'ASC',
- title : '发货科室分组设置',
- isCheckboxSelectionModel : true,
- rememberSelected : false,
- isShowSearchField : true,
- columns : columns,
- plugins : filters,
-// autoExpandColumn : 'departNames',
- renderTo : 'gridDiv',
- frame : false
+ tbar: tbar,
+ pageSize: 20,
+ defaultSortField: 'orderNum',
+ defaultSortDirection: 'ASC',
+ title: '发货科室分组设置',
+ isCheckboxSelectionModel: true,
+ rememberSelected: false,
+ isShowSearchField: true,
+ columns: columns,
+ plugins: filters,
+ searchDisableIndexes: ["id", "handlerDepartName"],
+ renderTo: 'gridDiv',
+ frame: false
}, readerDetail,
- InvoiceDepartmentTableManage.findInvoiceDepartmentTableList,
+ InvoiceDepartmentTableManage.findInvoiceDepartmentTableList,
dwrCallParams // 这个参数只是占位作用
);
var viewport = new Ext.Viewport({
- layout : 'border',
- items : [{
- region : 'center',
- margins : '0 0 0 0',
- layout : 'fit',
- items : grid
+ layout: 'border',
+ items: [{
+ region: 'center',
+ margins: '0 0 0 0',
+ layout: 'fit',
+ items: grid
}]
});
});
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.js
===================================================================
diff -u -r40302 -r40459
--- ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.js (.../invoicePlanExtractedView.js) (revision 40302)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.js (.../invoicePlanExtractedView.js) (revision 40459)
@@ -827,7 +827,7 @@
diposableGooodsStore.load();
var departGroupStore = new Ext.data.SimpleStore({
fields : ['id', 'shift','departCode' ],
- url : WWWROOT + '/disinfectSystem/invoiceDepartmentAction!loadDepartGroup.do'
+ url : WWWROOT + '/disinfectSystem/invoiceDepartmentAction!loadDepartGroup.do?handlerDepartCode='+currentOrgUnitCoding
});
departGroupStore.on('load', function(){
Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.jsp
===================================================================
diff -u -r39677 -r40459
--- ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.jsp (.../invoicePlanExtractedView.jsp) (revision 39677)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.jsp (.../invoicePlanExtractedView.jsp) (revision 40459)
@@ -137,6 +137,7 @@