Index: ssts-web/src/main/webapp/disinfectsystem/config/dgshlyy/menu/menuconfigure.js =================================================================== diff -u -r34413 -r34499 --- ssts-web/src/main/webapp/disinfectsystem/config/dgshlyy/menu/menuconfigure.js (.../menuconfigure.js) (revision 34413) +++ ssts-web/src/main/webapp/disinfectsystem/config/dgshlyy/menu/menuconfigure.js (.../menuconfigure.js) (revision 34499) @@ -718,7 +718,7 @@ {hidden :SSTS_application_end_cause_manager,text:"器械包废弃原因设置",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=tousse_discard_cause',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_foreignProxyGroup_manager,text:"外部代理灭菌分组设置",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=foreignProxyGroup',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_foreignTousseProcessType_manager,text:"外来器械处理方式",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=foreignTousseProcessType',hrefTarget:linkTarget,leaf:true}, - //{hidden :SSTS_Material,text:"材料类型设置",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=materialType',hrefTarget:linkTarget,leaf:true}, + {hidden :SSTS_Material,text:"材料类型设置",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=materialType',hrefTarget:linkTarget,leaf:true}, //{hidden :SSTS_Material,text:"材料清洗分类设置",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=materialWashClasify',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_TaskGroup,text:"任务组设置",href:WWWROOT+'/disinfectsystem/basedatamanager/taskGroup/taskGroupView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_Damage,text:"丢失报损类型设置",href:WWWROOT+'/disinfectsystem/basedatamanager/damageErrorMaterialType/damageErrorMaterialTypeView.jsp',hrefTarget:linkTarget,leaf:true}, Index: ssts-web/src/main/webapp/disinfectsystem/config/dgshlyy/config.js =================================================================== diff -u -r34459 -r34499 --- ssts-web/src/main/webapp/disinfectsystem/config/dgshlyy/config.js (.../config.js) (revision 34459) +++ ssts-web/src/main/webapp/disinfectsystem/config/dgshlyy/config.js (.../config.js) (revision 34499) @@ -70,7 +70,7 @@ //是否显示包实例科室(待灭菌与待灭菌装载的表格) showDepartOfTousseInstanceSterile : true, //对申请单的物品申请数量是否启用干预功能 - enableInterfereApplyAmount : true, + //enableInterfereApplyAmount : true, //是否禁用整筐发货 disableScanBasketInvoice : false, //科室申领中，是否启用打印选中物品 @@ -119,7 +119,7 @@ enableUrgentFunction:true, // ====================================================================修改或新增的配置======================================================================= // 外来器械申请桌面图标 - desktopShortcutIconsConfig: ["外来器械申请"], + desktopShortcutIconsConfig: ["外来器械申请","器械包库存"], // 禁用批量装入虚拟篮筐功能(仅仅隐藏页面相关的元素、不做后台控制.未配此参数时则标识牌功能默认为禁用),只有值为false才启用,为其它任何值或未配置此属性均表示禁用 disableLoadToVirtualBasket: false, // 科室申领显示回收数量 @@ -158,7 +158,7 @@ // 如果一个用户属于多个科室， 登录完系统需不需要弹出切换科室选项的小窗 defaultShowOrgChange: true, // 使用记录转换申请单后的合并规则。 - useRecordConvertRecyclingApplicationMergeRegular: "depart", + //useRecordConvertRecyclingApplicationMergeRegular: "depart", // 一次性物品库存不足时，是否允许申领 allowApplyDisposableGoodsWhenUnderstock: false, // 是否隐藏同步退库单菜单 @@ -179,6 +179,18 @@ // enableSaveAndPrintWhenInvoice: true, // 打印标识牌时，是否在单独的一行打印标识牌的编号 printIdNumberOnSeperateRow: true, - //启用按科室单独打印明细核算月报 - seperatePrintDetailedAccountingMonthlyReportByDept:true + //不打印发货类型为自动扣减的一次性物品 + notPrintInvoiceOfDisposableGoodsWhichTypeIsAutoDecrease:true, + //外来器械申请单在回收界面被查阅过后允许修改 + enableModifyForeignTousseApplicationAfterViewedInRecyclingModule:true, + //开启外来器械申请单统计报表材料汇总显示 + enableShowForeignTousseApplicationReportSummaryOfMaterials:true, + // 是否禁用人员同步 + hiddenUserSyncButton: true, + //是否禁用科室同步 + hiddenOrgunitSyncButton:true, + //是否禁用使用记录快速回收 + disableUseRecordQuickRecycling:true, + //启用按科室单独打印明细核算月报 + seperatePrintDetailedAccountingMonthlyReportByDept:true } \ No newline at end of file Index: ssts-web/src/main/webapp/disinfectsystem/config/dgshlyy/print/printConfig.js =================================================================== diff -u -r34459 -r34499 --- ssts-web/src/main/webapp/disinfectsystem/config/dgshlyy/print/printConfig.js (.../printConfig.js) (revision 34459) +++ ssts-web/src/main/webapp/disinfectsystem/config/dgshlyy/print/printConfig.js (.../printConfig.js) (revision 34499) @@ -1172,9 +1172,152 @@ tableHtml += ""; tableHtml += ""; LODOP.ADD_PRINT_HTM(tableTop,tableLeft,tableWidth,tableHeight,""+tableHtml+""); +} +//满意度调查表 +var printSatisfactionSurveyConfig = { + customPrint:printSatisfactionSurvey +} +function satisfactionSurveycheckInput(htmls,satisfactionObj){ + htmls += ""; + if(satisfactionObj == "SATISFACTION"){ + htmls += " "; + }else{ + htmls += " "; + } + htmls += ""; + if(satisfactionObj == "MORESATISFACTION"){ + htmls += " "; + }else{ + htmls += " "; + } + + htmls += ""; + if(satisfactionObj == "BASICSATISFACTION"){ + htmls += " "; + }else{ + htmls += " "; + } + + htmls += ""; + if(satisfactionObj == "NOTVERYSATISFACTION"){ + htmls += " "; + }else{ + htmls += " "; + } + + htmls += ""; + if(satisfactionObj == "NOSATISFACTION"){ + htmls += " "; + }else{ + htmls += " "; + } + htmls +="" + htmls +=""; + return htmls; } +function printSatisfactionSurvey(data){ + var headHtml = "
"+data.satisfactionSurveyTemplateName+"
"; + //调查内容1 + var surveyItemHtml = ""; + surveyItemHtml += "" + + "" + + ""+ + ""+ + ""; + for(var i = 0; i < data.answerItems.length;i++){ + surveyItemHtml += "" + + "" + + ""; + + if(data.answerItems[i].children != undefined && data.answerItems[i].children.length > 0){//有子级 + surveyItemHtml += ""; + var childrens = data.answerItems[i].children; + for(var j = 0;j < childrens.length;j++){ + surveyItemHtml += "" + + "" + + ""+ + "" + + "" + + ""+ + ""+ + ""; */ + surveyItemHtml += "
序号项目内容评价
"+(i+1)+""+data.answerItems[i].content+"
"+(i+1)+"."+(j+1)+""+childrens[j].content+""; + surveyItemHtml = satisfactionSurveycheckInput(surveyItemHtml,childrens[j].satisfaction); + } + }else{ + surveyItemHtml += ""; + surveyItemHtml = satisfactionSurveycheckInput(surveyItemHtml,data.answerItems[i].satisfaction); + } + } +/* surveyItemHtml += "
20"+data.remark+""+ + "、"+ + "、"+ + "、"+ + "、"+ + ""+ + "
"; + //调查内容2 + var surveyCustomHtml = ""; + surveyCustomHtml += "" + + ""+ + ""+ + ""; + var formInstanceItems = data.formInstanceItems; + if(formInstanceItems != undefined && formInstanceItems.length > 0){ + for(var k = 0;k < formInstanceItems.length;k++){ + surveyCustomHtml += "" + + ""; + surveyCustomHtml += ""; + surveyCustomHtml += ""; + } + } +/* surveyCustomHtml += "" + + "" + + ""+ + ""; */ + surveyCustomHtml += "" + + ""; + surveyCustomHtml += "" + + "" + + ""+ + ""; + + surveyCustomHtml += "
调查内容评价
"+formInstanceItems[k].name+""; + if(formInstanceItems[k].answer != undefined && formInstanceItems[k].answer.length > 0){ + var answers = formInstanceItems[k].answer; + if(formInstanceItems[k].options != undefined && formInstanceItems[k].options.length > 0){ + var options = formInstanceItems[k].options; + for(var m = 0;m < options.length;m++){ + surveyCustomHtml += ""; + if(answers.indexOf(options[m]) != -1){//存在 + surveyCustomHtml += "  "; + }else{ + surveyCustomHtml += "  "; + } + } + }else{ + surveyCustomHtml += ""+answers+""; + } + } + surveyCustomHtml += "
"+data.remark+""+ + " "+ + " "+ + " "+ + ""+ + "
意见及建议: "+(data.remark || '')+"
科室: "+data.depart+"日期: "+data.surveyDate+"
"; + var surveyAllHtml = "" + surveyAllHtml += ""; + surveyAllHtml += " "; + surveyAllHtml += "
"+surveyItemHtml+"
"+surveyCustomHtml+"
"; + //打印设置 + var LODOP = getLodop(document.getElementById('LODOP'),document.getElementById('LODOP_EM')); + //项目内容 + LODOP.ADD_PRINT_TABLE(80,"5%","90%","100%",surveyAllHtml); + //标题 + LODOP.ADD_PRINT_HTM(30,20,"95%",30,headHtml); +} //供应室出库统计表 var monthlyReportByDeptConfig = { title:{ @@ -1190,14 +1333,14 @@ top: 0 }, { label: '第#页 / 共&页', - left: 675, + left: 620, top: 0 } ], goodsTable :{ fontSize: 14, rowHeight: 30, - tableWidth:780, + tableWidth:750, columns: [{ align: "center", dataIndex: "depart", @@ -1207,22 +1350,22 @@ align: "center", dataIndex: "externalCode", header: "物资编码", - width: 100 + width: 85 }, { align: "center", dataIndex: "goodsName", header: "物资名称", - width: 100 + width: 170 }, { align: "center", dataIndex: "specification", header: "规格", - width: 80 + width: 120 }, { align: "center", dataIndex: "unit", header: "单位", - width: 80 + width: 35 }, { align: "center", dataIndex: "batchNumber", @@ -1232,12 +1375,12 @@ align: "center", dataIndex: "price", header: "单价", - width: 80 + width: 50 }, { align: "center", dataIndex: "amount", header: "数量", - width: 80 + width: 50 }, { align: "center", dataIndex: "settlementPrice", @@ -1343,6 +1486,8 @@ }, //打印器械包明细单 tousseDefinitionMaterials:tousseDefinitionMaterialsConfig_qifuyy, + //打印满意度调查表 + printSatisfactionSurveyData :printSatisfactionSurveyConfig, //供应室出库统计表 monthlyReportByDept:monthlyReportByDeptConfig };