From 8c610838bab2411c29a664fd89eae9ec51c80a1f Mon Sep 17 00:00:00 2001 From: "anna.ho" Date: Mon, 30 May 2022 15:45:36 +0800 Subject: [PATCH] customer report & orderImagePanel under msImagePanel --- src/main/webapp/resources/js/locale-zh_CN.js | 6 ++++++ src/main/webapp/resources/js/locale-zh_TW.js | 6 ++++++ .../js/view/Customer/CustomerContainer.js | 15 +++++++++++++-- .../webapp/resources/js/view/Order/OrderForm.js | 14 +++++++++++++- .../webapp/resources/js/view/Order/OrderWindow.js | 4 ++++ .../js/view/Report/Report_CustomerContainer.js | 2 ++ 6 files changed, 44 insertions(+), 3 deletions(-) diff --git a/src/main/webapp/resources/js/locale-zh_CN.js b/src/main/webapp/resources/js/locale-zh_CN.js index 214903d..cc39845 100644 --- a/src/main/webapp/resources/js/locale-zh_CN.js +++ b/src/main/webapp/resources/js/locale-zh_CN.js @@ -172,6 +172,12 @@ App.loadLocale_CH({ "Orders Report":"订单报告", "Outstanding Report":"未付报告", "Customer Report":"客户报告", + "Creation Date":"创建日期", + "Customer (Eng)":"客户（英）", + "Customer (Chinese)":"客户（中）", + "Phone 1":"电话 1", + "Phone 2":"电话 2", + "Order Amount (Total)":"订单金额（总）", "Current Password":"旧密码", "New Password":"新密码", diff --git a/src/main/webapp/resources/js/locale-zh_TW.js b/src/main/webapp/resources/js/locale-zh_TW.js index fae8934..ce8411c 100644 --- a/src/main/webapp/resources/js/locale-zh_TW.js +++ b/src/main/webapp/resources/js/locale-zh_TW.js @@ -173,6 +173,12 @@ App.loadLocale_ZH({ "Orders Report":"訂單報告", "Outstanding Report":"未付報告", "Customer Report":"客戶報告", + "Creation Date":"創建日期", + "Customer (Eng)":"客戶（英）", + "Customer (Chinese)":"客戶（中）", + "Phone 1":"電話 1", + "Phone 2":"電話 2", + "Order Amount (Total)":"訂單金額（總）", "Current Password":"舊密碼", "New Password":"新密碼", diff --git a/src/main/webapp/resources/js/view/Customer/CustomerContainer.js b/src/main/webapp/resources/js/view/Customer/CustomerContainer.js index 39d2687..0b3fb46 100644 --- a/src/main/webapp/resources/js/view/Customer/CustomerContainer.js +++ b/src/main/webapp/resources/js/view/Customer/CustomerContainer.js @@ -1,7 +1,9 @@ + Ext.define('App.view.CustomerContainer', { extend: 'Ext.container.Container', xtype: 'customerContainer', alias: 'widget.customerContainer', + itemId: 'customerContainer', layout: 'vbox', defaults: { width: '100%', @@ -203,11 +205,20 @@ Ext.define('App.view.CustomerContainer', { } ] }); - me.callParent(arguments); - } +/* + onScan.attachTo(document,{ + suffixKeyCodes: [13], + reactToPaste: false, + onScan: function(sCode,iQty ) { + alert(iQty + 'x ' + sCode); + } + }); +*/ + }, }); + Ext.define('App.view.CustomerGrid', { extend: 'Ext.grid.Panel', alias: 'widget.customerGrid', diff --git a/src/main/webapp/resources/js/view/Order/OrderForm.js b/src/main/webapp/resources/js/view/Order/OrderForm.js index 0ecc988..632d1af 100644 --- a/src/main/webapp/resources/js/view/Order/OrderForm.js +++ b/src/main/webapp/resources/js/view/Order/OrderForm.js @@ -499,7 +499,19 @@ Ext.define("App.view.OrderForm", { scope: this }); } - } + }, + { + xtype: 'label', + width: '100%', + html: '
', + }, + { + xtype: 'photoPanel', + itemId: 'orderPhotoPanel2', + width: '100%', + refType: 'order', + url: App.url("/order/image-list.json"), + }, ] }); diff --git a/src/main/webapp/resources/js/view/Order/OrderWindow.js b/src/main/webapp/resources/js/view/Order/OrderWindow.js index 49908b7..06b073b 100644 --- a/src/main/webapp/resources/js/view/Order/OrderWindow.js +++ b/src/main/webapp/resources/js/view/Order/OrderWindow.js @@ -81,18 +81,21 @@ Ext.define("App.view.OrderWindow", { orderPaymentGrid = me.down("orderPaymentGrid"), orderMeetingGrid = me.down("orderMeetingGrid"), orderPhotoPanel = me.down("#orderPhotoPanel"); + orderPhotoPanel2 = me.down("#orderPhotoPanel2"); orderLogGrid = me.down("orderLogGrid"); orderItemGrid.params = params; orderPaymentGrid.params = params; orderMeetingGrid.params = params; orderPhotoPanel.params = params; + orderPhotoPanel2.params = params; orderLogGrid.params = params; orderItemGrid.setDisabled(false); orderPaymentGrid.setDisabled(false); orderMeetingGrid.setDisabled(false); orderPhotoPanel.setDisabled(false); + orderPhotoPanel2.setDisabled(false); orderLogGrid.setDisabled(false); refreshBtn.setHidden(false); @@ -100,6 +103,7 @@ Ext.define("App.view.OrderWindow", { orderPaymentGrid.loadStore(formData.id); orderMeetingGrid.loadStore(formData.id); orderPhotoPanel.loadPanel(formData.id); + orderPhotoPanel2.loadPanel(formData.id); orderLogGrid.loadStore(formData.id); orderItemGrid.reconfigure(orderItemGrid.getStore()); diff --git a/src/main/webapp/resources/js/view/Report/Report_CustomerContainer.js b/src/main/webapp/resources/js/view/Report/Report_CustomerContainer.js index 57be670..ff9db11 100644 --- a/src/main/webapp/resources/js/view/Report/Report_CustomerContainer.js +++ b/src/main/webapp/resources/js/view/Report/Report_CustomerContainer.js @@ -22,6 +22,8 @@ Ext.define('App.view.Report_CustomerContainer', { }); }, + + params: {}, initComponent: function() { var me = this,