@@ -172,6 +172,12 @@ App.loadLocale_CH({ | |||||
"Orders Report":"订单报告", | "Orders Report":"订单报告", | ||||
"Outstanding Report":"未付报告", | "Outstanding Report":"未付报告", | ||||
"Customer Report":"客户报告", | "Customer Report":"客户报告", | ||||
"Creation Date":"创建日期", | |||||
"Customer (Eng)":"客户(英)", | |||||
"Customer (Chinese)":"客户(中)", | |||||
"Phone 1":"电话 1", | |||||
"Phone 2":"电话 2", | |||||
"Order Amount (Total)":"订单金额(总)", | |||||
"Current Password":"旧密码", | "Current Password":"旧密码", | ||||
"New Password":"新密码", | "New Password":"新密码", | ||||
@@ -173,6 +173,12 @@ App.loadLocale_ZH({ | |||||
"Orders Report":"訂單報告", | "Orders Report":"訂單報告", | ||||
"Outstanding Report":"未付報告", | "Outstanding Report":"未付報告", | ||||
"Customer Report":"客戶報告", | "Customer Report":"客戶報告", | ||||
"Creation Date":"創建日期", | |||||
"Customer (Eng)":"客戶(英)", | |||||
"Customer (Chinese)":"客戶(中)", | |||||
"Phone 1":"電話 1", | |||||
"Phone 2":"電話 2", | |||||
"Order Amount (Total)":"訂單金額(總)", | |||||
"Current Password":"舊密碼", | "Current Password":"舊密碼", | ||||
"New Password":"新密碼", | "New Password":"新密碼", | ||||
@@ -1,7 +1,9 @@ | |||||
Ext.define('App.view.CustomerContainer', { | Ext.define('App.view.CustomerContainer', { | ||||
extend: 'Ext.container.Container', | extend: 'Ext.container.Container', | ||||
xtype: 'customerContainer', | xtype: 'customerContainer', | ||||
alias: 'widget.customerContainer', | alias: 'widget.customerContainer', | ||||
itemId: 'customerContainer', | |||||
layout: 'vbox', | layout: 'vbox', | ||||
defaults: { | defaults: { | ||||
width: '100%', | width: '100%', | ||||
@@ -203,11 +205,20 @@ Ext.define('App.view.CustomerContainer', { | |||||
} | } | ||||
] | ] | ||||
}); | }); | ||||
me.callParent(arguments); | me.callParent(arguments); | ||||
} | |||||
/* | |||||
onScan.attachTo(document,{ | |||||
suffixKeyCodes: [13], | |||||
reactToPaste: false, | |||||
onScan: function(sCode,iQty ) { | |||||
alert(iQty + 'x ' + sCode); | |||||
} | |||||
}); | |||||
*/ | |||||
}, | |||||
}); | }); | ||||
Ext.define('App.view.CustomerGrid', { | Ext.define('App.view.CustomerGrid', { | ||||
extend: 'Ext.grid.Panel', | extend: 'Ext.grid.Panel', | ||||
alias: 'widget.customerGrid', | alias: 'widget.customerGrid', | ||||
@@ -499,7 +499,19 @@ Ext.define("App.view.OrderForm", { | |||||
scope: this | scope: this | ||||
}); | }); | ||||
} | } | ||||
} | |||||
}, | |||||
{ | |||||
xtype: 'label', | |||||
width: '100%', | |||||
html: '<br/><hr />', | |||||
}, | |||||
{ | |||||
xtype: 'photoPanel', | |||||
itemId: 'orderPhotoPanel2', | |||||
width: '100%', | |||||
refType: 'order', | |||||
url: App.url("/order/image-list.json"), | |||||
}, | |||||
] | ] | ||||
}); | }); | ||||
@@ -81,18 +81,21 @@ Ext.define("App.view.OrderWindow", { | |||||
orderPaymentGrid = me.down("orderPaymentGrid"), | orderPaymentGrid = me.down("orderPaymentGrid"), | ||||
orderMeetingGrid = me.down("orderMeetingGrid"), | orderMeetingGrid = me.down("orderMeetingGrid"), | ||||
orderPhotoPanel = me.down("#orderPhotoPanel"); | orderPhotoPanel = me.down("#orderPhotoPanel"); | ||||
orderPhotoPanel2 = me.down("#orderPhotoPanel2"); | |||||
orderLogGrid = me.down("orderLogGrid"); | orderLogGrid = me.down("orderLogGrid"); | ||||
orderItemGrid.params = params; | orderItemGrid.params = params; | ||||
orderPaymentGrid.params = params; | orderPaymentGrid.params = params; | ||||
orderMeetingGrid.params = params; | orderMeetingGrid.params = params; | ||||
orderPhotoPanel.params = params; | orderPhotoPanel.params = params; | ||||
orderPhotoPanel2.params = params; | |||||
orderLogGrid.params = params; | orderLogGrid.params = params; | ||||
orderItemGrid.setDisabled(false); | orderItemGrid.setDisabled(false); | ||||
orderPaymentGrid.setDisabled(false); | orderPaymentGrid.setDisabled(false); | ||||
orderMeetingGrid.setDisabled(false); | orderMeetingGrid.setDisabled(false); | ||||
orderPhotoPanel.setDisabled(false); | orderPhotoPanel.setDisabled(false); | ||||
orderPhotoPanel2.setDisabled(false); | |||||
orderLogGrid.setDisabled(false); | orderLogGrid.setDisabled(false); | ||||
refreshBtn.setHidden(false); | refreshBtn.setHidden(false); | ||||
@@ -100,6 +103,7 @@ Ext.define("App.view.OrderWindow", { | |||||
orderPaymentGrid.loadStore(formData.id); | orderPaymentGrid.loadStore(formData.id); | ||||
orderMeetingGrid.loadStore(formData.id); | orderMeetingGrid.loadStore(formData.id); | ||||
orderPhotoPanel.loadPanel(formData.id); | orderPhotoPanel.loadPanel(formData.id); | ||||
orderPhotoPanel2.loadPanel(formData.id); | |||||
orderLogGrid.loadStore(formData.id); | orderLogGrid.loadStore(formData.id); | ||||
orderItemGrid.reconfigure(orderItemGrid.getStore()); | orderItemGrid.reconfigure(orderItemGrid.getStore()); | ||||
@@ -22,6 +22,8 @@ Ext.define('App.view.Report_CustomerContainer', { | |||||
}); | }); | ||||
}, | }, | ||||
params: {}, | params: {}, | ||||
initComponent: function() { | initComponent: function() { | ||||
var me = this, | var me = this, | ||||