Index: ssts-web/src/main/webapp/disinfectsystem/borrow/borrowingTousseForm.js
===================================================================
diff -u -r34045 -r34521
--- ssts-web/src/main/webapp/disinfectsystem/borrow/borrowingTousseForm.js (.../borrowingTousseForm.js) (revision 34045)
+++ ssts-web/src/main/webapp/disinfectsystem/borrow/borrowingTousseForm.js (.../borrowingTousseForm.js) (revision 34521)
@@ -578,7 +578,7 @@
layout: 'form',
labelWidth: 70,
items: [{
- xtype: 'combo',
+ xtype: SSTS_UpdateAppDepartAndSettleAccountsDepart?'combo':'textfield',
fieldLabel: '申请科室',
id: 'depart',
name: 'depart',
@@ -593,6 +593,8 @@
hideTrigger: true,
typeAhead: false,
allowBlank: false,
+ readOnly: !SSTS_UpdateAppDepartAndSettleAccountsDepart,
+ fieldCls: 'fieldReadOnlyNoRemoveAndTop',
anchor: '100%',
listeners: {
select: function (combo, record, index) {
@@ -653,7 +655,7 @@
layout: 'form',
labelWidth: 70,
items: [{
- xtype: 'combo',
+ xtype: SSTS_UpdateAppDepartAndSettleAccountsDepart?'combo':'textfield',
fieldLabel: '结算科室',
id: 'settleAccountsDepart',
name: 'settleAccountsDepart',
@@ -669,6 +671,8 @@
typeAhead: false,
allowBlank: false,
anchor: '100%',
+ readOnly: !SSTS_UpdateAppDepartAndSettleAccountsDepart,
+ fieldCls: 'fieldReadOnlyNoRemoveAndTop',
listeners: {
select: function (combo, record, index) {
var settleAccountsDepartCoding = top.Ext.getCmp("settleAccountsDepart").getValue();
Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp
===================================================================
diff -u -r33909 -r34521
--- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp (.../goodsApplicationView.jsp) (revision 33909)
+++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp (.../goodsApplicationView.jsp) (revision 34521)
@@ -602,6 +602,10 @@
if (notInWhiteList(sstsConfig, 'deliveryManage')) {
SSTS_Invoice_End = true;
}
+var SSTS_UpdateAppDepartAndSettleAccountsDepart = false;
+
+ SSTS_UpdateAppDepartAndSettleAccountsDepart = true;
+
var profile = '${profile}';
Index: ssts-web/src/main/webapp/disinfectsystem/borrow/borrowingTousseView.jsp
===================================================================
diff -u -r29513 -r34521
--- ssts-web/src/main/webapp/disinfectsystem/borrow/borrowingTousseView.jsp (.../borrowingTousseView.jsp) (revision 29513)
+++ ssts-web/src/main/webapp/disinfectsystem/borrow/borrowingTousseView.jsp (.../borrowingTousseView.jsp) (revision 34521)
@@ -160,5 +160,6 @@
SSTS_borrow_InsteadReturn = true;
+ var SSTS_UpdateAppDepartAndSettleAccountsDepart = true;