Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/qualityMonitoringView.js
===================================================================
diff -u -r33889 -r33967
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/qualityMonitoringView.js (.../qualityMonitoringView.js) (revision 33889)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/qualityMonitoringView.js (.../qualityMonitoringView.js) (revision 33967)
@@ -184,13 +184,13 @@
width = columnWidth * 3;
}
if (rowspan > 1 || (rowspan == 1 && Object.keys(tableHeaderMap).length == 0)) {
- tableHtml += "| " + name + " | ";
+ tableHtml += "" + name + " | ";
} else {
if (name == '-') {
name = tableHeaderMap[tableHeader[i]][0];
rowspan = 2;
}
- tableHtml += "" + name + " | ";
+ tableHtml += "" + name + " | ";
}
if (!tableHeaderMap[tableHeader[i]]) {
widthArr.push(width);
@@ -219,7 +219,7 @@
}
widthArr.push(width);
if (item.split('+')[0] !== '-') {
- tableHtml += "" + arr[j] + " | ";
+ tableHtml += "" + arr[j] + " | ";
}
}
}
@@ -260,15 +260,15 @@
var newAmount = arr[0].amount;
var newRegisterMaterialAmount = arr[0].registerMaterialAmount;
if (result.dataType == '监测范围为材料和器械包的质量监测数据') {
- tdHtml += "" + arr[0].positionMsg + " | ";
+ tdHtml += "" + arr[0].positionMsg + " | ";
} else {
if (dateTime == '合格' || dateTime == '不合格' || dateTime == '合计' || arr[0].frequency == 0) {
- tdHtml += " | ";
+ tdHtml += " | ";
} else {
- tdHtml += "" + arr[0].frequency + " | ";
+ tdHtml += "" + arr[0].frequency + " | ";
}
}
- tdHtml += "" + arr[0].createUserName + " | ";
+ tdHtml += "" + arr[0].createUserName + " | ";
if (tableHeader1.length > 0) {
for (var i = 0; i < tableHeader1.length; i++) {
if (tableHeaderMap[tableHeader1[i]]) {
@@ -278,6 +278,7 @@
questionName = questionName.split('+').length > 1 ? questionName.split('+')[0] : questionName;
var option = options[j];
var answer = '';
+ var width = 50;
for (var k = 0; k < arr.length; k++) {
var arrOption = arr[k].option.split('+').length > 1 ? arr[k].option.split('+')[1] : arr[k].option;
if (arr[k].questionName == questionName && arrOption == option) {
@@ -288,7 +289,7 @@
continue
}
}
- tdHtml += "" + answer + " | ";
+ tdHtml += "" + answer + " | ";
}
}
trHtml = tdHtml;
@@ -308,30 +309,30 @@
name = (name == '空') ? '' : name;
tableHtml += "";
if (dateTimeIndex == 1) {
- tableHtml += "| " + dateTime + " | ";
+ tableHtml += "" + dateTime + " | ";
}
if (index == 1) {
- tableHtml += "" + name + " | ";
+ tableHtml += "" + name + " | ";
if (result.fixedColumnNames.indexOf('器械包材料总件数') >= 0) {
- tableHtml += "" + sumAmount + " | ";
+ tableHtml += "" + sumAmount + " | ";
}
}
if (result.scope == "材料和器械包") {
- tableHtml += "" + arr[0].materialName + " | ";
+ tableHtml += "" + arr[0].materialName + " | ";
if (rowspan > 1 && index == 1) {
- tableHtml += "" + newAmount + " | ";
+ tableHtml += "" + newAmount + " | ";
amount1 += newAmount;
} else if (rowspan == 1) {
- tableHtml += "" + newAmount + " | ";
+ tableHtml += "" + newAmount + " | ";
amount1 += newAmount;
}
- tableHtml += "" + newRegisterMaterialAmount + " | ";
+ tableHtml += "" + newRegisterMaterialAmount + " | ";
amount2 += newRegisterMaterialAmount;
} else if (result.scope == "器械包") {
- tableHtml += "" + newAmount + " | ";
+ tableHtml += "" + newAmount + " | ";
amount1 += newAmount;
} else if (result.scope == "材料") {
- tableHtml += "" + newRegisterMaterialAmount + " | ";
+ tableHtml += "" + newRegisterMaterialAmount + " | ";
amount2 += newRegisterMaterialAmount;
}
tableHtml += trHtml;
@@ -343,24 +344,24 @@
}
if (dateTime == '合计') {
tableHtml += "
";
- tableHtml += "| " + dateTime + " | ";
+ tableHtml += "" + dateTime + " | ";
if (result.scope !== '无' && result.scope !== '' && (result.scope == '灭菌炉记录' && result.dataType == '监测范围为灭菌炉记录的定期监测数据')) {
- tableHtml += " | ";
+ tableHtml += " | ";
}
if (result.scope == "材料和器械包") {
- tableHtml += " | ";
+ tableHtml += " | ";
}
if (result.fixedColumnNames.indexOf('器械包材料总件数') >= 0) {
- tableHtml += " | ";
+ tableHtml += " | ";
}
if (result.scope == "材料和器械包") {
- tableHtml += " | ";
- tableHtml += "" + amount1 + " | ";
- tableHtml += "" + amount2 + " | ";
+ tableHtml += " | ";
+ tableHtml += "" + amount1 + " | ";
+ tableHtml += "" + amount2 + " | ";
} else if (result.scope == "器械包") {
- tableHtml += "" + amount1 + " | ";
+ tableHtml += "" + amount1 + " | ";
} else if (result.scope == "材料") {
- tableHtml += "" + amount2 + " | ";
+ tableHtml += "" + amount2 + " | ";
}
tableHtml += tdHtml;
tableHtml += "
";
@@ -389,14 +390,14 @@
var tdHtml = "";
var arr = tableBody[dateTime][goodsName];
if (result.fixedColumnNames.indexOf('材料') >= 0) {
- tdHtml += "" + arr[0].materialName + " | ";
+ tdHtml += "" + arr[0].materialName + " | ";
}
var newAmount = arr[0].amount;
var newRegisterMaterialAmount = arr[0].registerMaterialAmount;
if (dateTime !== '合计') {
if (result.scope == "材料和器械包") {
- tdHtml += "" + newAmount + " | ";
- tdHtml += "" + newRegisterMaterialAmount + " | ";
+ tdHtml += "" + newAmount + " | ";
+ tdHtml += "" + newRegisterMaterialAmount + " | ";
if (result.dataType == '定期监测') {
if (dateTime == '合格' || dateTime == '不合格') {
amount1 += newAmount;
@@ -407,7 +408,7 @@
amount2 += newRegisterMaterialAmount;
}
} else if (result.scope == "器械包") {
- tdHtml += "" + newAmount + " | ";
+ tdHtml += "" + newAmount + " | ";
if (result.dataType == '定期监测') {
if (dateTime == '合格' || dateTime == '不合格') {
amount1 += newAmount;
@@ -416,7 +417,7 @@
amount1 += newAmount;
}
} else if (result.scope == "材料") {
- tdHtml += "" + newRegisterMaterialAmount + " | ";
+ tdHtml += "" + newRegisterMaterialAmount + " | ";
if (result.dataType == '定期监测') {
if (dateTime == '合格' || dateTime == '不合格') {
amount2 += newRegisterMaterialAmount;
@@ -427,9 +428,9 @@
}
}
if (result.dataType == '质量监测') {
- tdHtml += "" + arr[0].positionMsg + " | ";
+ tdHtml += "" + arr[0].positionMsg + " | ";
}
- tdHtml += "" + arr[0].createUserName + " | ";
+ tdHtml += "" + arr[0].createUserName + " | ";
if (tableHeader1.length > 0) {
for (var i = 0; i < tableHeader1.length; i++) {
if (tableHeaderMap[tableHeader1[i]]) {
@@ -438,14 +439,20 @@
var questionName = tableHeader1[i];
var option = options[j];
var answer = '';
+ var width = 50;
for (var k = 0; k < arr.length; k++) {
var arrOption = arr[k].option.split('+').length > 1 ? arr[k].option.split('+')[1] : arr[k].option;
+ if (arr[k].questionName == questionName.split('+')[0]) {
+ if (arr[k].width) {
+ width = arr[k].width;
+ }
+ }
if (arr[k].questionName == questionName.split('+')[0] && arrOption == option) {
answer = arr[k].answer;
continue
}
}
- tdHtml += "" + answer + " | ";
+ tdHtml += "" + answer + " | ";
}
}
trHtml = tdHtml;
@@ -458,10 +465,10 @@
name = (name == '空') ? '' : name;
tableHtml += "";
if (index == 1) {
- tableHtml += "| " + dateTime + " | ";
+ tableHtml += "" + dateTime + " | ";
}
if (result.scope !== '无' && result.scope !== '' && result.scope !== '灭菌炉记录') {
- tableHtml += "" + name + " | ";
+ tableHtml += "" + name + " | ";
}
tableHtml += trHtml;
tableHtml += "
";
@@ -470,17 +477,17 @@
}
if (dateTime == '合计') {
tableHtml += "";
- tableHtml += "| " + dateTime + " | ";
+ tableHtml += "" + dateTime + " | ";
if (result.scope !== '无' && result.scope !== '' && result.scope !== '灭菌炉记录') {
- tableHtml += " | ";
+ tableHtml += " | ";
}
if (result.scope == "材料和器械包") {
- tableHtml += "" + amount1 + " | ";
- tableHtml += "" + amount2 + " | ";
+ tableHtml += "" + amount1 + " | ";
+ tableHtml += "" + amount2 + " | ";
} else if (result.scope == "器械包") {
- tableHtml += "" + amount1 + " | ";
+ tableHtml += "" + amount1 + " | ";
} else if (result.scope == "材料") {
- tableHtml += "" + amount2 + " | ";
+ tableHtml += "" + amount2 + " | ";
}
tableHtml += tdHtml;
tableHtml += "
";
@@ -635,10 +642,10 @@
reportName: 'QualityMonitoring'
}
- if(sstsConfig.enableInstrumentSetTypeSetting){
+ if (sstsConfig.enableInstrumentSetTypeSetting) {
var instrumentSetTypes = Ext.getCmp('instrumentSetTypes').getValue();
- if(instrumentSetTypes !== ''){
- instrumentSetTypes = instrumentSetTypes.replace(/;/g,',');
+ if (instrumentSetTypes !== '') {
+ instrumentSetTypes = instrumentSetTypes.replace(/;/g, ',');
}
params.instrumentSetTypes = instrumentSetTypes;
}
@@ -975,32 +982,32 @@
typeAhead: false,
allowBlank: true
}]
- },{
- layout:'form',
- columnWidth:.4,
- hidden:!sstsConfig.enableInstrumentSetTypeSetting,
- items:[{
+ }, {
+ layout: 'form',
+ columnWidth: .4,
+ hidden: !sstsConfig.enableInstrumentSetTypeSetting,
+ items: [{
//用于保存时：传递器械包种类id
- xtype : 'hidden',
- id : 'instrumentSetTypes',
- name : 'instrumentSetTypes'
- },{
- xtype : 'trigger',
- fieldLabel : "所属种类",
- allowBlank : true,
- name : "tousseSetTypeName",
- id : "tousseSetTypeName",
- msgTarget:'side',
- readOnly:true,
- onTriggerClick : function(){
+ xtype: 'hidden',
+ id: 'instrumentSetTypes',
+ name: 'instrumentSetTypes'
+ }, {
+ xtype: 'trigger',
+ fieldLabel: "所属种类",
+ allowBlank: true,
+ name: "tousseSetTypeName",
+ id: "tousseSetTypeName",
+ msgTarget: 'side',
+ readOnly: true,
+ onTriggerClick: function () {
var ids = Ext.getCmp('instrumentSetTypes').getValue();
var names = Ext.getCmp('tousseSetTypeName').getValue();
- setInstrumentSetType('instrumentSetTypes' , 'tousseSetTypeName' , ids, names);
+ setInstrumentSetType('instrumentSetTypes', 'tousseSetTypeName', ids, names);
},
- triggerClass : 'x-form-search-trigger',
- anchor : '95%'
+ triggerClass: 'x-form-search-trigger',
+ anchor: '95%'
}]
- }, {
+ }, {
layout: 'form',
columnWidth: .2,
id: 'showCheckBox',