Index: ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js
===================================================================
diff -u -r38507 -r38560
--- ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js (.../config.js) (revision 38507)
+++ ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js (.../config.js) (revision 38560)
@@ -365,6 +365,8 @@
expandQueryFieldsConfigOfTousseInfoQuery:[{"fieldName":"recyclingTime","QueryName":"回收"}],
//定时废弃过期包的数量
maxAutoWasteAmountOneTimeTask: 500000,
+//外来器械包管理扩展列配置
+expandColoumnsConfigOfForeignTousseView:[{coloumnName:"defaultSterilizationProgram",displayText:"默认灭菌程序"}],
//功能模块默认查询时间
defaultQueryTimeOfTheFunctionModule:[{"functionalModule": "invoicePlan","queryPeriod": "180"},{"functionalModule": "invoicePlan_inventoryInquiry","queryPeriod": "180"},{"functionalModule": "tousseManager","queryPeriod": "180"},{"functionalModule": "reviewView","queryPeriod": "180"},{"functionalModule": "useRecord","queryPeriod": "180"},{"functionalModule": "recyclingApplication","queryPeriod": "0"}]
}
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/foreignTousseView.js
===================================================================
diff -u -r36807 -r38560
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/foreignTousseView.js (.../foreignTousseView.js) (revision 36807)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/foreignTousseView.js (.../foreignTousseView.js) (revision 38560)
@@ -442,6 +442,21 @@
var name = record.data.name;
return "" + name + "";
}
+
+//ZSYY-391:新增扩展列功能和新增扩展列“灭菌程序”
+var expandColoumnsConfigOfForeignTousseView = sstsConfig.expandColoumnsConfigOfForeignTousseView || [];
+var sterilingMethodHeader = '默认灭菌程序';
+var sterilingMethodHidden = true;
+
+if(expandColoumnsConfigOfForeignTousseView.length > 0){
+ for(var i=0;i