Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/alertDiv/AlertBox.js =================================================================== diff -u -r12331 -r35140 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/alertDiv/AlertBox.js (.../AlertBox.js) (revision 12331) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/alertDiv/AlertBox.js (.../AlertBox.js) (revision 35140) @@ -5,18 +5,18 @@ * Date: 2010-10-10 */ -//��ʾ����� +//显示层对象 var AlertBox = function(box, options){ - //��ʼ������ + //初始化程序 this._initialize( box, options ); this._initBox(); }; AlertBox.prototype = { _initialize: function(box, options) { - this.box = $$(box);//��ʾ�� + this.box = $$(box);//显示层 - this._css = null;//������ʽ + this._css = null;//备份样式 this._setOptions(options); @@ -28,57 +28,57 @@ $$CE.fireEvent( this, "init" ); }, - //����Ĭ������ + //设置默认属性 _setOptions: function(options) { - this.options = {//Ĭ��ֵ - fixed: false,//�Ƿ�̶���λ - zIndex: 1000,//���ֵ - onShow: $$.emptyFunction,//��ʾʱִ�� - onClose: $$.emptyFunction//�ر�ʱִ�� + this.options = {//默认值 + fixed: false,//是否固定定位 + zIndex: 1000,//层叠值 + onShow: $$.emptyFunction,//显示时执行 + onClose: $$.emptyFunction//关闭时执行 }; return $$.extend(this.options, options || {}); }, - //��ʼ����ʾ����� + //初始化显示层对象 _initBox: function() { var style = this.box.style; - this._css = { "display": style.display, "visibility": style.visibility, "position": style.position, "zIndex": style.zIndex };//������ʽ + this._css = { "display": style.display, "visibility": style.visibility, "position": style.position, "zIndex": style.zIndex };//备份样式 style.display = "none"; style.visibility = "visible"; document.body.insertBefore(this.box, document.body.childNodes[0]); $$CE.fireEvent( this, "initBox" ); }, - //��ʾ + //显示 show: function(isResize) { - //��λ��ʾ + //定位显示 var style = this.box.style; style.position = this.fixed ? "fixed" : "absolute"; style.zIndex = this.zIndex; $$CE.fireEvent( this, "show", isResize ); style.display = "block"; this.onShow(); }, - //�ر� + //关闭 close: function() { this.box.style.display = "none"; $$CE.fireEvent( this, "close" ); this.onClose(); }, - //��ٳ��� + //销毁程序 dispose: function() { $$CE.fireEvent( this, "dispose" ); - $$D.setStyle( this.box, this._css );//�ָ���ʽ - //������� + $$D.setStyle( this.box, this._css );//恢复样式 + //清除属性 this.box = this.onShow = this.onClose = null; } }; -//����fixed���� +//修正fixed对象 var RepairFixed = function() { if ( !$$B.ie6 ) return; - var layer, body, parent = "__repairfixed";//��¼���ڵ� - function Create(){//������λ�㺯�� + var layer, body, parent = "__repairfixed";//记录父节点 + function Create(){//创建定位层函数 body = document.body if (body.currentStyle.backgroundAttachment !== "fixed") { if (body.currentStyle.backgroundImage === "none") { @@ -95,29 +95,29 @@ Create(); elem[ parent ] = elem.parentNode; layer.appendChild(elem).runtimeStyle.position = "absolute"; - //����body + //插入body if ( layer.parentNode !== body ) body.insertBefore(layer, body.childNodes[0]); }, "remove": function(elem){ if ( !layer ) return; - //�Ƴ�Ԫ�� + //移除元素 if ( elem.parentNode === layer ) { elem.runtimeStyle.position = ""; elem[ parent ] ? elem[parent].appendChild(elem) : layer.removeChild(elem); - elem.removeAttribute(parent);//������delete + elem.removeAttribute(parent);//不能用delete } - //û���ڲ�Ԫ�ؾ��Ƴ� + //没有内部元素就移除 if ( !layer.childNodes.length && layer.parentNode == body ) body.removeChild(layer); } }; }(); -//����ie6��չ +//兼容ie6扩展 if ( $$B.ie6 ) { AlertBox.prototype._initialize = (function(){ var init = AlertBox.prototype._initialize, methods = { "init": function(){ - this._iframe = null;//�ڸ�select��iframe + this._iframe = null;//遮盖select的iframe this.fixSelect = !!this.options.fixSelect; }, "show": function(isResize) { @@ -147,11 +147,11 @@ }; return function(){ var args = [].slice.call(arguments), options = args[1] = args[1] || {}; - //��չoptions + //扩展options $$.extend( options, { - fixSelect: true//�Ƿ��޸�select�ڸ����� + fixSelect: true//是否修复select遮盖问题 }, false ); - //��չ���� + //扩展钩子 $$A.forEach( methods, function( method, name ){ $$CE.addEvent( this, name, method ); }, this ); @@ -160,12 +160,12 @@ })();} -//������չ +//居中扩展 AlertBox.prototype._initialize = (function(){ var init = AlertBox.prototype._initialize, methods = { "init": function(){ - this._centerCss = null;//��¼ԭʼ��ʽ + this._centerCss = null;//记录原始样式 this.center = !!this.options.center; }, "show": function(isResize){ @@ -196,11 +196,11 @@ }; return function(){ var args = [].slice.call(arguments), options = args[1] = args[1] || {}; - //��չoptions + //扩展options $$.extend( options, { - center: false//�Ƿ���� + center: false//是否居中 }, false ); - //��չ���� + //扩展钩子 $$A.forEach( methods, function( method, name ){ $$CE.addEvent( this, name, method ); }, this ); @@ -209,7 +209,7 @@ })(); -//���Dz� +//覆盖层 var OverLay = function(){ var overlay; function Create(){ @@ -222,9 +222,9 @@ Create = $$.emptyFunction; } return { - "color": "#fff",//����ɫ - "opacity": .5,//͸����(0-1) - "zIndex": 100,//���ֵ + "color": "#fff",//背景色 + "opacity": .5,//透明度(0-1) + "zIndex": 100,//层叠值 "show": function(){ Create(); $$D.setStyle( overlay.box, { Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js =================================================================== diff -u -r35055 -r35140 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 35055) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 35140) @@ -4020,11 +4020,11 @@ urgentAmountElement += '
'; } if (sstsConfig.enableApplyGoodsRemarkFunction) { - urgentAmountElement += '
'; if (remarkOfApplyGoods !== '') { + urgentAmountElement += '
'; urgentAmountElement += ''; + urgentAmountElement += '
'; } - urgentAmountElement += '
'; } var arr = [row]; urgentAmountElement += '
' + msg + '
'; @@ -4045,11 +4045,11 @@ urgentAmountElement += '
'; } if (sstsConfig.enableApplyGoodsRemarkFunction) { - urgentAmountElement += '
'; if (remarkOfApplyGoods !== '') { + urgentAmountElement += '
'; urgentAmountElement += ''; + urgentAmountElement += '
'; } - urgentAmountElement += '
'; } var arr = [row]; urgentAmountElement += '
' + msg + '
'; @@ -4984,6 +4984,12 @@ var id = document.getElementById('id').value; var app_id = document.getElementById('recyclingApplicationId').value; var departCode = document.getElementById('departCode').value; + var settleAccountsDepartCoding = ''; + var settleAccountsDepart = ''; + if(sstsConfig.showSettlementDepartmentInRecycleForm){ + settleAccountsDepartCoding = document.getElementById('settleAccountsDepartCoding').value; + settleAccountsDepart = document.getElementById('settleAccountsDepart').innerText; + } var recyclingUser = document.getElementById('recyclingUser').value; var departmentSender = document.getElementById('departmentSender').value; var operator = document.getElementById('operator').value; @@ -5005,6 +5011,8 @@ recyclingApplicationId: app_id, invoicePlanVersion: $("#invoicePlanVersion").val(), departCode: departCode, + settleAccountsDepartCoding:settleAccountsDepartCoding, + settleAccountsDepart:settleAccountsDepart, tousseNames: lastTousseNames, recyclingUser: recyclingUser, departmentSender: departmentSender, @@ -5314,9 +5322,9 @@ arr.push(row) } }) - if(arr.length > 0){ + if (arr.length > 0) { openSetUrgentAmountPage(arr.join(','), false) - }else { + } else { alertDiv("请添加器械包！"); } } @@ -6093,7 +6101,7 @@ var isSwitchingDepartments = true;//如果当前科室状态为 部分回收/待回收时，isSwitchingDepartments为false,不清空已经扫描过的篮筐和已经入筐的物品 var dialogWidth = dialogWidth; var dialogHeight = dialogHeight; -function openSelectDepart() { +function openSelectDepart(departType) { var canChangeDepart = false; if (isUndefinedOrNullOrEmpty(params_appId)) { //添加的回收申请单,可以修改科室 @@ -6174,7 +6182,7 @@ layerIndex = layer.open({ type: 2, title: ['选择科室', true], - content: 'addDepart.jsp?resolution=' + resolution + '&width=' + width + '&height=' + height + "&showDisableOrgUnit=false", + content: 'addDepart.jsp?resolution=' + resolution + '&width=' + width + '&height=' + height + "&showDisableOrgUnit=false&departType=" + departType, area: [width + 'px', height + heightExtra + 'px'], border: [5, 0.3, '#fff', true], closeBtn: [2, true], @@ -6339,7 +6347,7 @@ dataType: 'json', success: function (dataArray) { var departmentSenderHidden = $("#departmentSenderHidden").val(); - if (sstsConfig.showSelfTransportorInRecycleForm && departmentSenderHidden != "") { + if (!sstsConfig.showSettlementDepartmentInRecycleForm && sstsConfig.showSelfTransportorInRecycleForm && departmentSenderHidden != "") { var departmentSenderHiddendData = JSON.parse(departmentSenderHidden); var flag = false; for (var m in departmentSenderHiddendData) { @@ -6412,6 +6420,11 @@ } } +function selectSettleAccountsDepart(departName, departCode){ + document.getElementById('settleAccountsDepart').innerText = departName; + document.getElementById('settleAccountsDepartCoding').value = departCode; +} + //按字母过滤 function btnBoxKey(boxkey) { var patt1 = new RegExp(boxkey, 'gi'); @@ -6527,15 +6540,15 @@ } } } else { - if (sstsConfig.showSettleAccountsDepartInRecycling) { - $("#depart").text(application.settleAccountsDepart); - $("#departCode").val(application.settleAccountsDepartCoding); - $("#recyclingStatus").val(application.recyclingStatus); - } else { - $("#depart").text(application.depart); - $("#departCode").val(application.departCoding); - $("#recyclingStatus").val(application.recyclingStatus); + $("#depart").text(application.depart); + $("#departCode").val(application.departCoding); + $("#recyclingStatus").val(application.recyclingStatus); + + if(sstsConfig.showSettlementDepartmentInRecycleForm){ + $("#settleAccountsDepart").text(application.settleAccountsDepart); + $("#settleAccountsDepartCoding").val(application.settleAccountsDepartCoding); } + $("#invoicePlanVersion").val(application.version); $("#appType").val(application.type); $("#applyTime").val(application.submitTime); @@ -7051,6 +7064,10 @@ $("#recyclingTime").val(dateObjFormat(record.recyclingTime)); $("#communicationUserName").val(record.communicationUserName); $("#communicationUserCode").val(record.communicationUserCode); + if(sstsConfig.showSettlementDepartmentInRecycleForm){ + $("#settleAccountsDepart").text(record.recyclingApplication.settleAccountsDepart); + $("#settleAccountsDepartCoding").text(record.recyclingApplication.settleAccountsDepartCoding); + } var application = record.recyclingApplication; if (application != null) { $("#recyclingApplicationId").val(application.id); @@ -7566,9 +7583,13 @@ if (sstsConfig.enbaleRecoveryCheckLeftKeyboard) { $('#btnBoxGoods').show(); } - //在回收界面是否显示科室自送人输入框, - if (sstsConfig.showSelfTransportorInRecycleForm) { - $('.departmentSender').show(); + if (sstsConfig.showSettlementDepartmentInRecycleForm) { + $('.settleAccountsDepart').show(); + } else { + //在回收界面是否显示科室自送人输入框, + if (sstsConfig.showSelfTransportorInRecycleForm) { + $('.departmentSender').show(); + } } if (sstsConfig.enableRFIDTousseIdCard && !isIE()) { connectRFIDFun(); Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/style.css =================================================================== diff -u -r35055 -r35140 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/style.css (.../style.css) (revision 35055) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/style.css (.../style.css) (revision 35140) @@ -36,9 +36,11 @@ .add-form .operator{ top:-30px; left:250px; font-size: 23px; color: #3B5B67;} .add-form .recyclingTime{top:-30px; left:610px; font-size: 23px; color: #3B5B67;} .add-form .depart{ top:38px; left:-110px; font-size: 23px; color: #3B5B67;} +.add-form .settleAccountsDepart{ top:-70px; left:5px; font-size: 23px; color: #3B5B67;} .add-form .appType{ top:38px; left:250px; font-size: 23px; color: #3B5B67;} .add-form .applyTime{top:38px; left:610px; font-size: 23px; color: #3B5B67;} -.add-form .remark{top:120px; left:-110px; font-size: 23px;} +.add-form .remark{top:120px; left:-110px; font-size: 23px;color: #3B5B67;} +.add-form .departmentSender{font-size: 23px; color: #3B5B67;} .communicationUserName{ top:105px; left:612px; font-size: 23px; color: #3B5B67;} .add-form .add{ margin-top:170px; right:20px;} Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp =================================================================== diff -u -r35055 -r35140 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp (.../recycleForTouchScreen.jsp) (revision 35055) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp (.../recycleForTouchScreen.jsp) (revision 35140) @@ -220,7 +220,7 @@ var userType_operator = 'operator'; var userType_departmentSender = 'departmentSender'; var currentUserType = userType_recycling; -if(sstsConfig.showSelfTransportorInRecycleForm){ +if(sstsConfig.showSelfTransportorInRecycleForm && !sstsConfig.showSettlementDepartmentInRecycleForm){ currentUserType = userType_departmentSender; } @@ -405,6 +405,16 @@ .departmentSender{ display: none; } + .settleAccountsDepart{ + display: none; + } + .settleAccountsDepart span { + margin-right: 5px; + font-size: 23px; + display: block; + float: left; + margin-top: 20px; + } .add-form .name{ left: 25px; top: 0; @@ -418,7 +428,7 @@ top: 0; } .add-form .depart{ - left: 25px; + left: 5px; top: 70px; } .add-form .appType{ @@ -601,18 +611,20 @@
自送人
+
结算科室
+
回收人
清点人
回收时间
-
科室
+
申请科室
类型
最后修改时间
@@ -829,7 +841,7 @@ $('.add-form .name').css({'top':'40px','left':'30px'}); $('.add-form .operator').css({'top':'40px','left':'390px'}); $('.add-form .recyclingTime').css({'top':'40px','left':'785px'}); - $('.add-form .depart').css({'top':'130px','left':'30px'}); + $('.add-form .depart').css({'top':'130px','left':'10px'}); $('.add-form .appType').css({'top':'130px','left':'390px'}); $('.add-form .applyTime').css({'top':'130px','left':'740px'}); $('.add-form .remark').css({'top':'220px','left':'25px'}); Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/addDepart.jsp =================================================================== diff -u -r29515 -r35140 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/addDepart.jsp (.../addDepart.jsp) (revision 29515) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/addDepart.jsp (.../addDepart.jsp) (revision 35140) @@ -28,6 +28,7 @@ if('${param.showDisableOrgUnit}' == "false"){ showDisableOrgUnit = false; } + var departType = '${param.departType}';
@@ -138,7 +139,10 @@ if(isFilterApplication){ window.parent.setApplyDepartment(departName,departCode); closeLayer(); - }else{ + }else if(departType == 4){ + window.parent.selectSettleAccountsDepart(departName,departCode); + closeLayer(); + }else{ window.parent.selectDepart(departName,departCode); closeLayer(); } @@ -180,7 +184,7 @@ if(sign != ""){ pages = 1; } - OrgUnitTableManager.searchOrgUnitBySpellOrWbCode(inputObj.value,pages,pageSize,showDisableOrgUnit,function(result){ + OrgUnitTableManager.searchOrgUnitBySpellOrWbCode(inputObj.value,pages,pageSize,showDisableOrgUnit,departType,function(result){ if(result != null){ var htmlResultCode = "
    "; var orgUnitJsonArray = JSON.parse(result);