Index: ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationView.js
===================================================================
diff -u -r40302 -r41382
--- ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationView.js (.../operationReservationView.js) (revision 40302)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationView.js (.../operationReservationView.js) (revision 41382)
@@ -31,6 +31,11 @@
$Id('parm_s_operationTime_start').value = $Id('query_operationTime_start').value;
$Id('parm_s_operationTime_end').value = $Id('query_operationTime_end').value;
$Id('parm_s_takeOutStatus').value = $Id('query_takeOutStatus').value;
+ $Id('parm_s_operationName').value = $Id('query_operationName').value;
+ $Id('parm_s_doctors').value = $Id('query_doctors').value;
+ if(sstsConfig.enableMultipleBranchesOfHospital){
+ $Id('parm_s_brancheOfHospital').value = $Id('query_brancheOfHospital').value == '-1' ? '' : $Id('query_brancheOfHospital').value;
+ }
}
//明细grid删除按钮
function renderDeleteButton(v, p, record, rowIndex) {
@@ -1553,6 +1558,32 @@
committedStatusDefault = '已提交';
}
+ var brancheOfHospitalStoreRecord = Ext.data.Record.create([
+ { name: 'id', type: 'string' },
+ { name: 'name', type: 'string' }
+ ]);
+
+ var brancheOfHospitalStore = new Ext.data.Store({
+ proxy: new Ext.data.HttpProxy({
+ url: WWWROOT + '/disinfectSystem/brancheOfHospitalAction!findBrancheOfHospitalList.do',
+ method: 'POST'
+ }),
+ reader: new Ext.data.JsonReader({
+ totalProperty: 'totalCount',
+ root: 'data'
+ }, [
+ { name: 'id' },
+ { name: 'name' }]
+ ),
+ listeners:{
+ load: function (thiz, records, options) {
+ if (brancheOfHospitalStore.getCount() > 1) {
+ brancheOfHospitalStore.insert(0, new brancheOfHospitalStoreRecord({ 'id': '-1', 'name': '全部' }));
+ }
+ }
+ }
+ });
+
var form = new Ext.form.FormPanel({
title: '',
region: 'north',
@@ -1564,7 +1595,7 @@
border: 0,
frame: true,
bodyStyle: 'padding:0px auto;margin:0px',
- height: fontSize == '15' ? 120 : 100,
+ height: fontSize == '15' ? 140 : 120,
items: [{
layout: 'column',
items: [{
@@ -1719,6 +1750,82 @@
}
}
}]
+ }, {
+ columnWidth: .33,
+ layout: 'form',
+ labelWidth: 85,
+ labelAlign: "right",
+ items: [{
+ xtype: 'textfield',
+ fieldLabel: '手术名称',
+ name: 'query_operationName',
+ id: 'query_operationName',
+ anchor: '95%'
+ }]
+ }, {
+ columnWidth: .33,
+ layout: 'form',
+ labelWidth: 85,
+ labelAlign: "right",
+ items: [{
+ xtype: 'textfield',
+ fieldLabel: '医生',
+ name: 'query_doctors',
+ id: 'query_doctors',
+ anchor: '95%'
+ }]
+ }, {
+ columnWidth: .33,
+ layout: 'form',
+ labelWidth: 85,
+ labelAlign: "right",
+ hidden: !sstsConfig.enableMultipleBranchesOfHospital,
+ items: [{
+ xtype: 'multiSelect',
+ fieldLabel: '院区',
+ id: "query_brancheOfHospital",
+ name: "query_brancheOfHospital",
+ minChars: 0,
+ valueField: 'id',
+ displayField: 'name',
+ store: brancheOfHospitalStore,
+ forceSelection: false,
+ lazyInit: true,
+ triggerAction: 'all',
+ typeAhead: false,
+ editable: false,
+ anchor: '95%',
+ separator:';',
+ listeners:{
+ select: function (combo, record, index) {
+ //1、如果选中“全部”的项，则把所有的项选中，反之全部取消选择
+ if (record.get('name') == '全部') {
+ if (record.get('checked')) {
+ combo.selectAll();
+ } else {
+ combo.deselectAll();
+ }
+ }
+
+ //2、如果已经选中所有的项，则把“全部”项选中，反之把“全部”项取消选择
+ var selectAll = true;
+ combo.store.each(function (record) {
+ if (record.get('name') != '全部' && !record.get(this.checkField)) {
+ selectAll = false;
+ return;
+ }
+ }, combo);
+
+ var all = combo.store.getAt(0);
+ if (selectAll) {
+ all.set(combo.checkField, true);
+ } else {
+ all.set(combo.checkField, false);
+ }
+ combo.setValue(combo.getCheckedValue());
+ }
+ }
+ }]
}]
}],
buttons: [
@@ -1740,10 +1847,14 @@
$Id('query_committedStatus').value = "未提交";
$Id('query_invoiceStatus').value = "全部";
$Id('query_operatingRoom').value = "";
- $Id('query_operationTime_start').value = "";
- $Id('query_operationTime_end').value = "";
+ $Id('query_operationName').value = "";
+ $Id('query_doctors').value = "";
$Id('query_takeOutStatus').value = "全部";
Ext.getCmp('query_takeOutStatus').setValue('全部');
+ if(sstsConfig.enableMultipleBranchesOfHospital){
+ $Id('query_brancheOfHospital').value = "";
+ brancheOfHospitalStore.load();
+ }
}
}
]
@@ -1765,9 +1876,9 @@
{ header: "病区", width: 100, dataIndex: 'deptName' },
{ header: "病人年龄", width: 100, dataIndex: 'patientAge' },
{ header: "手术时间", width: 120, dataIndex: 'operationTime', renderer: myDateFormatByMinute },
- //{header : "手术编号",width : 120,dataIndex : 'scheduleId'},
- { header: "发货状态", width: 65, dataIndex: 'deliverStatus', renderer: renderColor },
- { header: "取出状态", width: 65, dataIndex: 'takeOutStatus',hidden:!sstsConfig.enableOperationReservationShippedToTraysOfKardexContainer, renderer: renderTakeOutStatusColor },
+ {header : "院区",width : 80,dataIndex : 'brancheOfHospital',hidden:!sstsConfig.enableMultipleBranchesOfHospital},
+ { header: "发货状态", width: 70, dataIndex: 'deliverStatus', renderer: renderColor },
+ { header: "取出状态", width: 70, dataIndex: 'takeOutStatus',hidden:!sstsConfig.enableOperationReservationShippedToTraysOfKardexContainer, renderer: renderTakeOutStatusColor },
{ id: 'remark', header: "备注", dataIndex: 'remark' }
];
@@ -1789,6 +1900,7 @@
{ name: 'patientAge' },
{ name: 'deliverStatus' },
{ name: 'takeOutStatus' },
+ { name: 'brancheOfHospital' },
{ name: 'committedStatus' },
{ name: 'surgicalDiagnosis' },
{ name: 'remark' }
@@ -1872,7 +1984,7 @@
}
}];
- var searchDisableIndexes = ['takeOutStatus'];
+ var searchDisableIndexes = ['takeOutStatus','brancheOfHospital'];
if(!surgicalDiagnosisShowInList){
searchDisableIndexes.push('surgicalDiagnosis')
}
Index: ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationView.jsp
===================================================================
diff -u -r40302 -r41382
--- ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationView.jsp (.../operationReservationView.jsp) (revision 40302)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationView.jsp (.../operationReservationView.jsp) (revision 41382)
@@ -128,6 +128,9 @@
+
+
+