Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/commonlyUsedDoctor/comUsedDoctorForm.js
===================================================================
diff -u
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/commonlyUsedDoctor/comUsedDoctorForm.js (revision 0)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/commonlyUsedDoctor/comUsedDoctorForm.js (revision 21085)
@@ -0,0 +1,128 @@
+var id;
+var formObj;
+var urgentLevelWin;
+function addAndEditUrgentLevel(id) {
+ this.id = id;
+
+ var enableStore = new Ext.data.SimpleStore({
+ data:[['是'],['否']],
+ fields:['value']
+ });
+
+ formObj = new top.Ext.FormPanel({
+ id : 'urgentLevelForm',
+ frame : true,
+ labelSeparator : '：',
+ labelAlign:'right',
+ bodyStyle : 'padding:5px 5px 0px 5px',
+ layout : 'column',
+ autoHeight:true,
+ autoScroll : true,
+ items : [ {
+ xtype : 'hidden',
+ id : 'id',
+ name : 'id'
+ },{
+ columnWidth : 0.33,
+ layout : 'form',
+ labelWidth:60,
+ items : [{
+ xtype : 'textfield',
+ fieldLabel : "医生名称",
+ allowBlank : false,
+ id : "doctorName",
+ name : "doctorName",
+ anchor : '95%'
+ }]
+ },{
+ columnWidth : 0.33,
+ layout : 'form',
+ labelWidth:60,
+ items : [{
+ xtype : 'textfield',
+ fieldLabel : "拼音码",
+ allowBlank : false,
+ id : "pinYinCode",
+ name : "pinYinCode",
+ anchor : '95%'
+ }]
+ }],
+ buttons : [{
+ id : 'saveBtn',
+ text : '保存',
+ handler : save
+ },{
+ text : '取消',
+ id : 'saveAndNewBtn',
+ handler : cancel
+ }]
+ });
+
+
+ urgentLevelWin = new top.Ext.Window({
+ id : 'urgentLevelWin',
+ layout : 'fit',
+ title : '加急级别信息',
+ width : 600,
+ border : false,
+ modal : true,
+ autoHeight : true,
+ plain : true,
+ items : [ formObj ]
+ });
+ urgentLevelWin.show();
+ if(id != 0){
+ formObj.form.load({
+ url : WWWROOT + '/disinfectSystem/baseData/urgentLevelAction!loadUrgentLevel.do',
+ method : 'GET',
+ waitMsg : '正在加载数据，请稍候',
+ success : function(form, action) {
+ top.Ext.getCmp('doctorName').setValue(action.result.data.name);
+ top.Ext.getCmp('pinYinCode').setValue(action.result.data.enable);
+ top.Ext.getCmp('pinYinCode').setValue(action.result.data.urgent);
+ },
+ failure : function(form, action) {
+ showResult("加载失败");
+ },
+ params : {id : id}
+ });
+ }
+}
+
+function submit(){
+ formObj.form.submit({
+ url : WWWROOT + '/disinfectSystem/baseData/urgentLevelAction!saveUrgentLevel.do',
+ method : 'POST',
+ waitMsg : '正在保存数据，请稍候',
+ waitTitle : '提交表单',
+ success : function(form, action) {
+ if(action.result && action.result.message){
+ showResult(action.result.message);
+ }
+ if(action.result.success){
+ refreshData();
+ cancel();
+ }
+ },
+ failure : function(form, action) {
+ if(action.result && action.result.message){
+ showResult(action.result.message);
+ }
+ }
+ });
+}
+
+function save() {
+ this.disable();
+ if (!formObj.form.isValid()) {
+ showResult('请正确填写表单各值');
+ this.enable();
+ return false;
+ }
+ submit();
+
+}
+
+function cancel() {
+ urgentLevelWin.close();
+}
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/commonlyUsedDoctor/comUsedDoctorView.js
===================================================================
diff -u
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/commonlyUsedDoctor/comUsedDoctorView.js (revision 0)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/commonlyUsedDoctor/comUsedDoctorView.js (revision 21085)
@@ -0,0 +1,197 @@
+var entityName = "加急级别";
+var grid;
+var urgentStore
+
+extCompOperationUtil.setExtObj(Ext);
+gridOperation = extCompOperationUtil.getGridOperation();
+motionObj = extCompOperationUtil.getMotionObj();
+
+
+
+function initUrgentStore(){
+
+ var rd = new Ext.data.JsonReader( {
+ fields : [
+ {name : 'id'},
+ {name : 'doctorName'},
+ {name : 'pinYinCode'}
+ ]
+ });
+
+ //加急等级数据源
+ urgentStore = new Ext.data.Store({
+ proxy : new Ext.data.HttpProxy({
+ url : WWWROOT + '/disinfectSystem/baseData/commonlyUsedDoctorAction!getAllCommonlyUsedDoctor.do',
+ method : 'POST'
+ }),
+ reader : rd
+ });
+ urgentStore.load();
+}
+
+
+var loadFormData = function(grid) {
+ var records = grid.getSelectionModel().getSelections();
+ if (records.length == 0) {
+ showResult("请选择要修改的"+entityName+"！");
+ return false;
+ }
+ if (records.length > 1) {
+ showResult("一次只能修改一个"+entityName+"！");
+ return false;
+ }
+ id = records[0].data['id'];
+ addAndEditUrgentLevel(id);
+};
+
+
+
+/**
+ * 修改记录
+ * modifyRecord函数 触发modify函数调用，并传入当前列的值以及record.data对象
+ * 页面中需要定义 modify(v,data) 函数
+ */
+function modify(v,data){
+ loadFormData(grid);
+}
+
+function setRecordLevel(store){
+ var newGrade = 1;
+ for(var i=store.getCount() - 1;i>=0;--i){
+ var record = store.getAt(i);
+ record.data.newGrade = newGrade++;
+// record.set('newGrade',i+1); 速度会很慢，ext会刷新grid
+ }
+}
+function setRecordSequenceAndGetSupplyRoomItemsStr(store){
+ setRecordLevel(store);// 设置序号
+ return buildJSONStringFromStore(store);
+}
+function getGridData() {
+ return setRecordSequenceAndGetSupplyRoomItemsStr(Ext.getCmp('grid').getStore());
+}
+function refreshData(){
+ urgentStore.reload();
+}
+Ext.onReady(function() {
+ Ext.QuickTips.init();
+ // 记录cookie（3步）
+
+ var sign = true;
+ var tbar = [ {
+ text : '添加',
+ hidden : SSTS_UrgentLevel_Create,
+ iconCls : 'btn_ext_application_add',
+ handler : function() {
+ addAndEditUrgentLevel(0);
+ }
+ }, '-', {
+ text : '修改',
+ hidden : SSTS_UrgentLevel_Update,
+ iconCls : 'btn_ext_application_edit',
+ id : 'editTbar',
+ handler : function() {
+ loadFormData(grid);
+ }
+ }];
+ var dwrCallParams = null;
+
+ Ext.ux.ForgonPageGrid.prototype.getGridParameterMap = function() {
+
+ };
+
+ var cm = new Ext.grid.ColumnModel( [ {
+ id : 'id',
+ dataIndex : 'id',
+ hidden :true
+ },{
+ id : 'doctorName',
+ dataIndex : 'doctorName',
+ header : "医生名称",
+ width : 200,
+ renderer : modifyRecord,
+ hidden :false
+ },{
+ id : 'sequence',
+ dataIndex : 'sequence',
+ hidden :true
+ },{
+ header : "拼音码",
+ id : 'pinYinCode',
+ dataIndex : 'pinYinCode',
+ width : 200,
+ hidden :false
+ },{
+ id : 'deleteItem3',
+ header:'排序操作',
+ width : 200,
+ renderer: function(v,p,record){
+ var str = "![](\"")
"
+ + " "
+ + " "
+ + " ";
+ return str;
+ },
+ menuDisabled:true,
+ dataIndex:'id'
+ }
+ ]);
+ initUrgentStore();
+ grid = new Ext.grid.EditorGridPanel({
+ id : 'grid',
+ store : urgentStore,
+ cm : cm,
+ autoScroll:true,
+ frame : false,
+ width:document.body.offsetWidth-12,
+ height:document.body.offsetHeight-94,
+ bodyStyle : 'border:1px solid #9cbaef',
+ clicksToEdit : 1,
+ selModel : new Ext.grid.RowSelectionModel({
+ singleSelect : false
+ }),
+ tbar : tbar
+ });
+ var formPanel = new Ext.form.FormPanel({
+ id: "myFormPanel",
+ frame : true,
+ border : false,
+ renderTo: 'gridDiv',
+ buttonAlign :'center',
+ height : document.body.offsetHeight,
+ layout : 'border',
+ items:[grid],
+ buttonAlign :'center',
+ buttons:[{
+ text:'保存',
+ handler:function(){
+ var myMask = new Ext.LoadMask(Ext.getBody(), {msg:"正在保存..."});
+ myMask.show();
+
+ Ext.Ajax.request({
+ url : WWWROOT + '/disinfectSystem/baseData/commonlyUsedDoctorAction!getAllCommonlyUsedDoctor.do',
+ method:'POST',
+ params : {
+ gridData:getGridData()
+ },
+ success : function(response, options) {
+ var result = Ext.decode(response.responseText);
+ myMask.hide();
+ if(result.message){
+ showResult(result.message);
+ }
+ refreshData();
+ },
+ failure : function(response, options) {
+ myMask.hide();
+ var result = Ext.decode(response.responseText);
+ if(result.message){
+ showResult(result.message);
+ }
+ }
+ });
+ }
+ }]
+ });
+
+ });
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/customIntoBasket.js
===================================================================
diff -u -r19889 -r21085
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/customIntoBasket.js (.../customIntoBasket.js) (revision 19889)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/customIntoBasket.js (.../customIntoBasket.js) (revision 21085)
@@ -224,7 +224,7 @@
barcodeTemp='';
$.ajax({
type:'get',
- url:WWWROOT + '/disinfectSystem/recyclingRecordAction!getBarcodeInfo.do?time='+new Date()+'&barcode='+barcode,
+ url:encodeURI(WWWROOT + '/disinfectSystem/recyclingRecordAction!getBarcodeInfo.do?time='+new Date()+'&barcode='+barcode),
dataType:'json',
success:function(msg){
if(msg.errorMessage != null ){
@@ -858,7 +858,7 @@
document.onkeydown = showKeyDown;
$.ajax({
type : 'post',
- url : WWWROOT + '/disinfectSystem/recyclingRecordAction!loadUnCleanedEntirelyMaterial.do?data=' + param_data,
+ url : encodeURI(WWWROOT + '/disinfectSystem/recyclingRecordAction!loadUnCleanedEntirelyMaterial.do?data=' + param_data),
dataType : 'json',
success : function(result) {
if(result && result.success){
Index: ssts-web/src/main/resources/spring/applicationContext-disinfectsystem-service.xml
===================================================================
diff -u -r21064 -r21085
--- ssts-web/src/main/resources/spring/applicationContext-disinfectsystem-service.xml (.../applicationContext-disinfectsystem-service.xml) (revision 21064)
+++ ssts-web/src/main/resources/spring/applicationContext-disinfectsystem-service.xml (.../applicationContext-disinfectsystem-service.xml) (revision 21085)
@@ -891,6 +891,24 @@
class="com.forgon.disinfectsystem.tousse.toussedefinition.service.TousseInstanceManagerImpl">
+
+
+
+
+