Index: ssts-web/src/main/webapp/disinfectsystem/config/zjyy/config.js
===================================================================
diff -u -r33814 -r33829
--- ssts-web/src/main/webapp/disinfectsystem/config/zjyy/config.js	(.../config.js)	(revision 33814)
+++ ssts-web/src/main/webapp/disinfectsystem/config/zjyy/config.js	(.../config.js)	(revision 33829)
@@ -233,5 +233,7 @@
   //启用待回收列表的表格列自定义
   enableTableColumnCustomizationForTheWaitRecycleList :["科室","手术间","患者","住院号","物品清单","包数","申请人","最后修改时间"],
   //启用历史回收记录列表的表格列自定义
-  enableTableColumnCustomizationForTheHistoryRecyclingRecordList :["科室","手术间","患者","物品清单","包数","清点人","申请单号"]
+  enableTableColumnCustomizationForTheHistoryRecyclingRecordList :["科室","手术间","患者","物品清单","包数","清点人","申请单号"],
+  //外部代理灭菌单的表单字段自定义名称配置
+  customNameConfigurationForFormFieldsOfForeignProxyDisinfection: [{"fieldName":"applicant","displayName":"接收人"},{"fieldName":"maker","displayName":"装配人"}]
   }
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.js
===================================================================
diff -u -r32975 -r33829
--- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.js	(.../foreignProxyDisinfectionView.js)	(revision 32975)
+++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.js	(.../foreignProxyDisinfectionView.js)	(revision 33829)
@@ -12,6 +12,11 @@
 	mustScanBasketForForeignProxy = true;
 }
 
+//ZJYY-102:外部代理灭菌字段名称自定义
+var configureObj = replaceName('customNameConfigurationForFormFieldsOfForeignProxyDisinfection');
+var applicantName = configureObj.applicant;
+var makerName = configureObj.maker;
+
 var tousseStore = new Ext.data.Store({
 	proxy : new Ext.data.HttpProxy({
 		url : WWWROOT + '/disinfectSystem/baseData/tousseDefinitionAction!getExternalTousseDefinitionData.do',
@@ -942,7 +947,7 @@
 					hidden : sstsConfig.hideCssdForeignProxyDisinfectionApplicant == true,
 					items : [{
 						xtype : 'combo',
-						fieldLabel : sstsConfig.foreignProxyDisinfectionApplicantLabelName ? sstsConfig.foreignProxyDisinfectionApplicantLabelName : '申请人',
+						fieldLabel : applicantName,//申请人
 						id : 'applicant',
 						name : 'applicant',
 						queryParam : 'spell',
@@ -1003,7 +1008,7 @@
 					hidden : sstsConfig.hideCssdForeignProxyDisinfectionMaker == true,
 					items : [{
 						xtype : 'combo',
-						fieldLabel : '制作者',
+						fieldLabel : makerName,
 						id : 'maker',
 						name : 'maker',
 						queryParam : 'spell',
@@ -2251,7 +2256,7 @@
 	
 	var columns = [
 	    {header : "流水号",width : 90,dataIndex : 'serialNumber', renderer : modifyRecord},
-	    {header : sstsConfig.foreignProxyDisinfectionApplicantLabelName ? sstsConfig.foreignProxyDisinfectionApplicantLabelName : "申请人",width : 80,dataIndex : 'applicant',hidden : sstsConfig.hideCssdForeignProxyDisinfectionApplicant},
+	    {header : applicantName,width : 80,dataIndex : 'applicant',hidden : sstsConfig.hideCssdForeignProxyDisinfectionApplicant},
 	    {header : "灭菌员",width : 80,dataIndex : 'sterilizationUser',hidden : sstsConfig.hiddenForeignProxyPartElement},
 	    {header : "申请科室",width : 150,dataIndex : 'depart'},
 	    {header : "器械包数量",width : 80,dataIndex : 'tousseAmount'},
@@ -2264,7 +2269,7 @@
 	    }},
 	    {header : "状态",width : 70,dataIndex : 'deliverStatus'},
 	    {header : "物品简要",width : 400,dataIndex : 'lendGoodsBrief'},
-	    {header : "制作者",width : 80,dataIndex : 'maker',hidden : sstsConfig.hideCssdForeignProxyDisinfectionMaker},
+	    {header : makerName,width : 80,dataIndex : 'maker',hidden : sstsConfig.hideCssdForeignProxyDisinfectionMaker},
 	    {header : "核对者",width : 80,dataIndex : 'assistant',hidden : sstsConfig.hiddenForeignProxyPartElement},
 	    {header : "是否打印",width : 65,dataIndex : 'hasPrinted'},
 	    {header : "申请时间",width : 115,dataIndex : 'applicationTime',renderer : myDateFormatByMinute},
Index: ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/dataSource.js
===================================================================
diff -u -r33806 -r33829
--- ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/dataSource.js	(.../dataSource.js)	(revision 33806)
+++ ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/dataSource.js	(.../dataSource.js)	(revision 33829)
@@ -466,6 +466,11 @@
 	})]
 });
 objectDataSourceManager.registerDataSource(foreignTousseDataSource);
+//ZJYY-102:外部代理灭菌字段名称自定义
+var configureObj = replaceName('customNameConfigurationForFormFieldsOfForeignProxyDisinfection');
+var applicantName = configureObj.applicant;
+var makerName = configureObj.maker;
+
 // 外部代理灭菌包
 var foreignProxyDisinfectionTousseDataSource = new ObjectDataSource({
 	name: '外部代理灭菌包',
@@ -487,7 +492,7 @@
 		textForPreview: '李四'
 	}),new ObjectDataSourceProperty({
 		propName: 'maker',
-		displayName: '制作者',
+		displayName: makerName,
 		textForPreview: '制作者1'
 	}),new ObjectDataSourceProperty({
 		propName: 'assistant',
Index: ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js
===================================================================
diff -u -r33766 -r33829
--- ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js	(.../config.js)	(revision 33766)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js	(.../config.js)	(revision 33829)
@@ -188,7 +188,9 @@
   hideCssdForeignProxyDisinfectionMaker : true,
   enableReturnGoodsByInvoicePlan:true,
   //灭菌管理-外部代理灭菌里的applicant字段的显示名字(默认为申请人,省医改为接收人)
-  foreignProxyDisinfectionApplicantLabelName : "接收人",
+  foreignProxyDisinfectionApplicantLabelName : "接收人",//更新ZJYY-102后可删除
+  //外部代理灭菌单的表单字段自定义名称配置
+  customNameConfigurationForFormFieldsOfForeignProxyDisinfection: [{"fieldName":"applicant","displayName":"接收人"}],
   //显示一次性物品的外部编码，申请时true:显示false:不显示
   showExternalCodeOfDisposableGoods:true,
   //companyName:"dingxiang",
Index: ssts-web/src/main/webapp/js/common.js
===================================================================
diff -u -r33806 -r33829
--- ssts-web/src/main/webapp/js/common.js	(.../common.js)	(revision 33806)
+++ ssts-web/src/main/webapp/js/common.js	(.../common.js)	(revision 33829)
@@ -3180,16 +3180,26 @@
             doctorAccountDepart: '主刀医生核算科室',
             remark: '备注'
         }
+    } else if (configureName == 'customNameConfigurationForFormFieldsOfForeignProxyDisinfection') {
+        newArray = sstsConfig.customNameConfigurationForFormFieldsOfForeignProxyDisinfection;
+        obj = {
+            applicant: '申请人',
+            maker: '制作者'
+        }
     }
 
     if (newArray && typeof newArray == 'object') {
         if (newArray.length > 0) {
             for (var i = 0; i < newArray.length; i++) {
                 var fieldName = newArray[i].fieldName;
                 var displayText = newArray[i].displayText;
-                if (obj[fieldName]) {
+                var displayName = newArray[i].displayName;
+                if (obj[fieldName] && displayText) {
                     obj[fieldName] = displayText;
                 }
+                if (obj[fieldName] && displayName) {
+                    obj[fieldName] = displayName;
+                }
             }
         }
     }