Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp
===================================================================
diff -u -r30526 -r31556
--- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp (.../goodsApplicationView.jsp) (revision 30526)
+++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp (.../goodsApplicationView.jsp) (revision 31556)
@@ -308,6 +308,12 @@
}
+//申请科室和结算科室修改
+var SSTS_UpdateAppDepartAndSettleAccountsDepart = false;
+
+ SSTS_UpdateAppDepartAndSettleAccountsDepart = true;
+
+
//器械包申请权限
var SSTS_PACKAGE_Create = true;
Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js
===================================================================
diff -u -r31130 -r31556
--- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js (.../goodsApplicationForm.js) (revision 31130)
+++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js (.../goodsApplicationForm.js) (revision 31556)
@@ -2362,7 +2362,7 @@
top.Ext4.getCmp('projCode').setVisible(true);
projectStore.reload();
}
-
+
if(!id){//添加
//1、设置“申请人”和“申请时间”
top.Ext4.getCmp('applicant').setValue(curUserName);
@@ -2533,6 +2533,17 @@
loadProduction({}, false , recyclingApplication);
}
+ //GGSRMYY-147
+ if(!SSTS_UpdateAppDepartAndSettleAccountsDepart){
+ top.Ext4.getCmp('depart').disable();
+ top.Ext4.getCmp('settleAccountsDepart').disable();
+
+ top.Ext4.getCmp('depart').setValue($Id('depart').value);
+ top.Ext4.getCmp('settleAccountsDepart').setValue($Id('depart').value);
+ top.Ext4.getCmp('departCoding').setValue($Id('departCoding').value);
+ top.Ext4.getCmp('settleAccountsDepartCoding').setValue($Id('departCoding').value);
+ }
+
/**
* 加载已经申请的物品(包括申领模版的).
* @param para 格式{applicationType:申请单类型,id:申请单id,reloadTemplate:申请科室的科室编码}
Index: ssts-web/src/main/resources/systemset/operationDefine.xml
===================================================================
diff -u -r31428 -r31556
--- ssts-web/src/main/resources/systemset/operationDefine.xml (.../operationDefine.xml) (revision 31428)
+++ ssts-web/src/main/resources/systemset/operationDefine.xml (.../operationDefine.xml) (revision 31556)
@@ -33,6 +33,7 @@
+