Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/technicalDifficulty/technicalDifficultyForm.js =================================================================== diff -u --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/technicalDifficulty/technicalDifficultyForm.js (revision 0) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/technicalDifficulty/technicalDifficultyForm.js (revision 39139) @@ -0,0 +1,198 @@ +var configWin; +var formPanel; + +function cancel() { + configWin.close(); +} + +//排序 +function moveMaterial(orderType) { + setTimeout(function () { + var selectedRecords = listGrid.getSelectionModel().getSelection(); + var id = selectedRecords[0].data.id; + Ext4.Ajax.request({ + url: WWWROOT + '/disinfectSystem/core/httpOptionAction!sortHttpOption.do', + params: { id: id, orderType: orderType }, + success: function (response, options) { + var result = Ext4.JSON.decode(response.responseText); + var success = result.success; + if (true != success) { + showResult(result.message); + return; + } else { + showResult('排序成功!'); + listStore.load(); + } + }, + failure: function (response, options) { + var result = Ext4.JSON.decode(response.responseText); + showResult(result.message); + } + }); + }, 500); +} + +//删除技术难度管理 +function deleteConfig(grid) { + var selectedRecords = grid.getSelectionModel().getSelection(); + var selectedCount = grid.getSelectionModel().getCount(); + var ids = []; + if (selectedCount < 1) { + showResult("请选择要删除的数据"); + } else { + for (var i = 0, len = selectedRecords.length; i < len; i++) { + ids[i] = selectedRecords[i].data['id']; + } + Ext4.MessageBox.confirm("请确认", "确定要删除选中的信息吗？", function (button, text) { + if ("yes" == button) { + Ext4.Ajax.request({ + url: WWWROOT + '/disinfectSystem/core/httpOptionAction!deleteHttpOption.do', + params: { ids: ids.join(';') }, + success: function (response, options) { + var result = Ext4.JSON.decode(response.responseText); + var success = result.success; + if (true != success) { + showResult(result.message); + return; + } else { + showResult('删除成功!'); + listStore.load(); + } + }, + failure: function (response, options) { + var result = Ext4.JSON.decode(response.responseText); + showResult(result.message); + } + }); + } + }); + } +} + +//保存技术难度管理信息 +function saveConfig(id) { + var value = top.Ext4.getCmp('name').getValue(); + var status = top.Ext4.getCmp('status').getValue(); + var mask = new Ext4.LoadMask({ + msg: '正在保存，请稍候...', + target: formPanel + }); + mask.show(); + Ext4.Ajax.request({ + url: WWWROOT + '/disinfectSystem/core/httpOptionAction!saveOrUpdateHttpOption.do', + params: { id: id, optionText: value, status: status, optionListId: 'technicalDifficulty' }, + success: function (response, options) { + var result = Ext4.decode(response.responseText); + if (result.success) { + configWin.close(); + listStore.load(); + showResult('保存成功'); + } else { + showResult(result.message); + } + mask.hide(); + }, + failure: function (response, options) { + showResult('保存失败!'); + mask.hide(); + } + }); +} + +//显示技术难度管理信息的窗口 +function showAddOrEditWindow(recordItem) { + var id = recordItem.id; + var value = recordItem.name; + var status = recordItem.status; + + var statusStore = new Ext4.data.SimpleStore({ + data: [['是', 1], ['否', 0]], + fields: ['name', 'value'] + }) + formPanel = new top.Ext4.form.Panel({ + id: 'configForm', + frame: true, + labelSeparator: ':', + bodyStyle: 'padding:5px 5px 0px 5px;', + width: 400, + buttonAlign: 'center', + fieldDefaults: { + labelAlign: 'right', + labelWidth: 70 + }, + border: 0, + items: [{ + layout: 'column', + border: 0, + items: [{ + columnWidth: 0.48, + layout: 'form', + border: 0, + style: 'margin-bottom:10px', + items: [{ + xtype: 'textfield', + fieldLabel: '名称', + id: 'name', + name: 'name', + allowBlank: false, + value: value || '', + anchor: '95%' + }] + }, { + columnWidth: 0.48, + layout: 'form', + border: 0, + style: 'margin-bottom:10px', + items: [{ + xtype: 'combo', + fieldLabel: '是否启用', + valueField: 'value', + displayField: 'name', + store: statusStore, + forceSelection: true, + allowBlank: false, + mode: 'local', + triggerAction: 'all', + name: "status", + id: "status", + editable: false, + value: status == undefined ? 1 : status, + anchor: '95%' + }] + }] + }], + buttons: [{ + id: 'saveBtn', + text: '保存', + handler: function () { + if (formPanel.getForm().isValid()) { + saveConfig(id); + } else { + showResult('请填写表单！'); + return false; + } + } + }, { + text: '取消', + handler: cancel + }] + }); + configWin = new top.Ext4.window.Window({ + id: 'configWin', + layout: 'column', + title: '技术难度管理信息', + width: 400, + height: 130, + border: false, + plain: true, + modal: true, + items: [{ + region: 'center', + width: 400, + layout: 'fit', + items: [formPanel] + }] + }); + configWin.show(); +} + Index: ssts-web/src/main/webapp/homepage/menu.jsp =================================================================== diff -u -r39099 -r39139 --- ssts-web/src/main/webapp/homepage/menu.jsp (.../menu.jsp) (revision 39099) +++ ssts-web/src/main/webapp/homepage/menu.jsp (.../menu.jsp) (revision 39139) @@ -2509,6 +2509,16 @@ /** + * 《QYSRMYY-69：技术难度管理》权限 + */ + var SSTS_TechnicalDifficulty_manager = true; + + if(sstsConfig.enableTousseApplySummary){ + SSTS_TechnicalDifficulty_manager = false + } + + +/** * 《流水号配置管理》权限 */ var SSTS_SerialNumber_manager = true; Index: ssts-web/src/main/webapp/homepage/menuconfigure.js =================================================================== diff -u -r39100 -r39139 --- ssts-web/src/main/webapp/homepage/menuconfigure.js (.../menuconfigure.js) (revision 39100) +++ ssts-web/src/main/webapp/homepage/menuconfigure.js (.../menuconfigure.js) (revision 39139) @@ -1137,6 +1137,7 @@ {hidden :(!sstsConfig.hasOwnProperty('disableDeviceInterface')) || sstsConfig.disableDeviceInterface,text:"设备接口管理",href:WWWROOT+'/disinfectsystem/basedatamanager/deviceInterface/deviceInterfaceView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_Expiration,text:"物品失效期管理",href:WWWROOT+'/disinfectsystem/basedatamanager/expirationDateInfo/expirationDateInfoView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_SupplyRoomType_manager,text:"PDA参数设置",href:WWWROOT+'/personalSetting/modifyExitLoginTime.jsp',hrefTarget:linkTarget,leaf:true}, + {hidden :SSTS_TechnicalDifficulty_manager,text:"技术难度管理",href:WWWROOT+'/disinfectsystem/basedatamanager/technicalDifficulty/technicalDifficultyView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_SupplyRoomType_manager,text:"仓库管理",href:WWWROOT+'/disinfectsystem/basedatamanager/warehouse/wareHouseView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_SupplyRoomType_manager,text:"各环节超时设置",href:WWWROOT+'/systemmanage/timeoutSetting.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_SerialNumber_manager,text:"流水号设置",href:WWWROOT+'/disinfectsystem/basedatamanager/serialnumconfig/serialNumConfigView.jsp',hrefTarget:linkTarget,leaf:true}, Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js =================================================================== diff -u -r38831 -r39139 --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js (.../tousseForm.js) (revision 38831) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js (.../tousseForm.js) (revision 39139) @@ -861,6 +861,9 @@ if(sstsConfig.showTousseNoteOnClickTousse && tousseDefinition.showTousseNote == ''){ top.Ext.getCmp('showTousseNote').setValue('是'); } + if(sstsConfig.enableTousseApplySummary && tousseDefinition.technicalDifficultyId == 0){ + top.Ext.getCmp('technicalDifficultyId').setValue(''); + } //ZSWY-206：显示或隐藏灭菌包装类型和灭菌标签纸类型 var tousseType = top.Ext.getCmp('tousseType').getValue(); setPackageTypeAndPaperTypeBox(tousseType,tousseDefinition.isSterile); @@ -933,6 +936,17 @@ } }); + //QYSRMYY-69：技术难度 + var technicalDifficultyStore = new Ext.data.JsonStore({ + url: WWWROOT + '/disinfectSystem/core/httpOptionAction!getHttpOptionTextAndValueById.do?optionId=technicalDifficulty&status=1', + fields:[ + { name: 'id', mapping: 'id' }, + { name: 'name', mapping: 'name' } + ] + }); + + technicalDifficultyStore.load(); + //标签纸类型combo的store var barcodePaperTypeStore = new Ext.data.JsonStore({ fields: ['name'], @@ -3315,6 +3329,42 @@ }, { columnWidth: colWidth, layout: 'form', + labelWidth: fontSize == 12 ? 90 : 120, + hidden: !sstsConfig.enableTousseApplySummary, + labelAlign: "right", + items: [{ + xtype: 'combo', + fieldLabel: '技术难度', + id: 'technicalDifficultyId', + name: 'technicalDifficultyId', + editable: true, + valueField: 'id', + displayField: 'name', + editable: false, + store: technicalDifficultyStore, + forceSelection: true, + allowBlank: true, + triggerAction: 'all', + anchor: '100%' + }] + }, { + columnWidth: colWidth, + layout: 'form', + labelWidth: fontSize == 12 ? 90 : 100, + labelAlign: "right", + hidden: !sstsConfig.enableTousseApplySummary, + items: [{ + xtype: 'numberfield', + fieldLabel: "权重分", + allowBlank: true, + allowNegative: false, + name: 'weightScore', + id: 'weightScore', + anchor: '100%' + }] + }, { + columnWidth: colWidth, + layout: 'form', labelWidth: 120, hidden: !sstsConfig.showTousseNoteOnClickTousse, labelAlign: "right", @@ -3840,7 +3890,6 @@ var expendPackingviewVideo = ""; var originTousseId = ""; var isDisableForCombo = {} - if (isExpend) {//如果是另存为的话，就把沿用的那几项的选择传过去 originTousseId = top.Ext.getCmp('id').getValue(); expendTousseImg = top.Ext.getCmp('expendTousseImg').getValue(); Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/technicalDifficulty/technicalDifficultyView.jsp =================================================================== diff -u --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/technicalDifficulty/technicalDifficultyView.jsp (revision 0) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/technicalDifficulty/technicalDifficultyView.jsp (revision 39139) @@ -0,0 +1,22 @@ +<%@ page contentType="text/html; charset=UTF-8"%> +<%@ include file="/common/taglibs.jsp"%> +<%@ page import="com.forgon.disinfectsystem.common.CssdUtils"%> + + + +<%@ include file="/common/includeExtJsAndCss.jsp"%> +<%@ include file="/common/includeExtJs4_2.jsp"%> + +技术难度管理 + + + + + + + + \ No newline at end of file Index: ssts-web/src/main/resources/systemset/operationDefine.xml =================================================================== diff -u -r39099 -r39139 --- ssts-web/src/main/resources/systemset/operationDefine.xml (.../operationDefine.xml) (revision 39099) +++ ssts-web/src/main/resources/systemset/operationDefine.xml (.../operationDefine.xml) (revision 39139) @@ -810,6 +810,7 @@ + Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/technicalDifficulty/technicalDifficultyView.js =================================================================== diff -u --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/technicalDifficulty/technicalDifficultyView.js (revision 0) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/technicalDifficulty/technicalDifficultyView.js (revision 39139) @@ -0,0 +1,104 @@ +var listStore; +var listGrid; + +function modify(v, data) { + showAddOrEditWindow(data); +} + +Ext4.onReady(function () { + Ext4.QuickTips.init(); + var columns = [ + { header: "id", dataIndex: 'id', hidden: true }, + { header: "名称", dataIndex: 'name', width: 150, renderer: modifyRecord }, + { + header: "是否启用", dataIndex: 'status', width: 150, renderer: function (v, p, record) { + if (v == 1) { + return '是'; + } else { + return '否'; + } + } + }, + { + header: "操作", dataIndex: 'serialNumber', width: 100, renderer: function (v, p, record) { + var str = "" + + ""; + return str; + } + } + ]; + var tbar = [{ + text: '添加', + iconCls: 'btn_ext_application_add', + handler: function () { + showAddOrEditWindow(''); + } + }, '-', { + text: '修改', + iconCls: 'btn_ext_application_edit', + handler: function () { + var selectedRecords = listGrid.getSelectionModel().getSelection(); + var selectedCount = listGrid.getSelectionModel().getCount(); + if (selectedCount < 1) { + showResult("请选择要修改的数据"); + } else if (selectedCount > 1) { + showResult("只能修改一条数据"); + } else { + showAddOrEditWindow(selectedRecords[0]); + } + } + }, '-', { + text: '删除', + iconCls: 'btn_ext_application_del', + handler: function () { + deleteConfig(listGrid); + } + }]; + + listStore = new Ext4.data.JsonStore({ + proxy: { + type: 'ajax', + url: WWWROOT + '/disinfectSystem/core/httpOptionAction!getHttpOptionTextAndValueById.do?optionId=technicalDifficulty', + reader: { + root: 'data' + }, + extraParams: {} + }, + fields: [ + { name: 'id' }, + { name: 'status' }, + { name: 'name' } + ] + }); + + listStore.loadPage(1); + + listGrid = new Ext4.grid.GridPanel({ + title: '技术难度管理', + columns: columns, + frame: false, + autoScroll: false, + store: listStore, + tbar: tbar, + dockedItems: [{ + xtype: 'pagingtoolbar', + store: listStore, // same store GridPanel is using + dock: 'bottom', + displayInfo: true + }], + viewConfig: { + autoFill: true + }, + selModel: new Ext4.selection.CheckboxModel() + }); + + new Ext4.container.Viewport({ + layout: 'border', + items: [{ + region: 'center', + layout: 'fit', + items: [listGrid] + }] + }); + +}); \ No newline at end of file