diff --git a/DSWeb/Areas/Account/Viewsjs/Chfee_invoiceapplication/ChInvoiceapplicationAudit.js b/DSWeb/Areas/Account/Viewsjs/Chfee_invoiceapplication/ChInvoiceapplicationAudit.js index 0cfd7078..bd9233fe 100644 --- a/DSWeb/Areas/Account/Viewsjs/Chfee_invoiceapplication/ChInvoiceapplicationAudit.js +++ b/DSWeb/Areas/Account/Viewsjs/Chfee_invoiceapplication/ChInvoiceapplicationAudit.js @@ -64,8 +64,36 @@ Ext.extend(Shipping.ChInvoiceapplicationAudit, Ext.Panel, { sortable: true, dataIndex: 'BILLSTATUSREF', header: Zi.LAN.status, - width: 80 - }, { + width: 80, + renderer: function (value, meta, record) { + + if (value == '审核通过') { + meta.tdCls = 'feestatus_pass'; + value = Zi.LAN.SHENHETONGGUO; + } else if (value == '录入状态') { + value = Zi.LAN.LURUZHUAGNTAI; + } else if (value == '已提交') { + meta.tdCls = 'feestatus_refer'; + value = Zi.LAN.TIJIAOSHENHE; + + } else if (value == '部分开出') { + meta.tdCls = 'feestatus_refer'; + value = Zi.LAN.BUFENKAICHU; + + } else if (value == '已开出') { + meta.tdCls = 'feestatus_settle'; + value = Zi.LAN.YIKAICHU; + + } else if (value == '驳回') { + meta.tdCls = 'feestatus_nopass'; + value = Zi.LAN.BUHUITIJIAO; + } else if (value == '未提交') { + value = Zi.LAN.WEITIJIAO; + } + return value; + } + } + , { sortable: true, dataIndex: 'CUSTOMERNAME', header: Zi.LAN.CUSTOMERNAME, @@ -609,7 +637,16 @@ Ext.extend(Shipping.ChInvoiceapplicationAudit, Ext.Panel, { sortable: true, dataIndex: 'FEETYPEREF', header: Zi.LAN.FEETYPEREF, - width: 40 + width: 40, + renderer: function (value, meta, record) { + + if (value == '收') { + value = Zi.LAN.DR; + } else if (value == '付') { + value = Zi.LAN.CR; + } + return value; + } }, { sortable: true, dataIndex: 'AMOUNT', @@ -855,7 +892,16 @@ Ext.extend(Shipping.ChInvoiceapplicationAudit, Ext.Panel, { sortable: true, dataIndex: 'FEETYPEREF', header: Zi.LAN.FEETYPEREF, - width: 40 + width: 40, + renderer: function (value, meta, record) { + + if (value == '收') { + value = Zi.LAN.DR; + } else if (value == '付') { + value = Zi.LAN.CR; + } + return value; + } }, { sortable: true, dataIndex: 'CURRENCY', @@ -1605,7 +1651,7 @@ Ext.extend(Shipping.ChInvoiceapplicationAudit, Ext.Panel, { }); return; } else { - Ext.Msg.show({ title: Zi.LAN.Prompt, msg: result.Message, icon: Ext.Msg.INFO, buttons: Ext.Msg.OK }); + //Ext.Msg.show({ title: Zi.LAN.Prompt, msg: result.Message, icon: Ext.Msg.INFO, buttons: Ext.Msg.OK }); _this.storeList.reload(); } diff --git a/DSWeb/Areas/Account/Viewsjs/Chfee_invoiceapplication/ChInvoiceapplicationBLEdit.js b/DSWeb/Areas/Account/Viewsjs/Chfee_invoiceapplication/ChInvoiceapplicationBLEdit.js index 592e60ea..b4c2ac92 100644 --- a/DSWeb/Areas/Account/Viewsjs/Chfee_invoiceapplication/ChInvoiceapplicationBLEdit.js +++ b/DSWeb/Areas/Account/Viewsjs/Chfee_invoiceapplication/ChInvoiceapplicationBLEdit.js @@ -409,6 +409,10 @@ Ext.extend(Shipping.MsChInvoiceapplicationBLEdit, Ext.Panel, { } }); + var BLTYPEDFIELDNAME = 'EnumValueName'; + if (strLANGUAGES == "en-us") { + BLTYPEDFIELDNAME = 'EnumValueName_2'; + } this.storeInvCategory = Ext.create('DsExt.ux.RefEnumStore', {}); this.storeInvCategory.load({ params: { enumTypeId: 97008} }); @@ -420,7 +424,7 @@ Ext.extend(Shipping.MsChInvoiceapplicationBLEdit, Ext.Panel, { forceSelection: true, name: 'INVOICECATEGORY', valueField: 'EnumValueId', - displayField: 'EnumValueName' + displayField: BLTYPEDFIELDNAME }); this.storeCompany = Ext.create('DsExt.ux.RefTableStore', { @@ -2163,6 +2167,7 @@ Ext.extend(Shipping.MsChInvoiceapplicationBLEdit, Ext.Panel, { store: this.storeFEERANGE, forceSelection: true, name: 'FEERANGE', + displayField: BLTYPEDFIELDNAME, enableKeyEvents: true, listeners: { keyup: function (field, e) { diff --git a/DSWeb/Areas/Account/Viewsjs/Chfee_invoiceapplication/ChInvoiceapplicationIndex.js b/DSWeb/Areas/Account/Viewsjs/Chfee_invoiceapplication/ChInvoiceapplicationIndex.js index 68d6b5d9..bd86485d 100644 --- a/DSWeb/Areas/Account/Viewsjs/Chfee_invoiceapplication/ChInvoiceapplicationIndex.js +++ b/DSWeb/Areas/Account/Viewsjs/Chfee_invoiceapplication/ChInvoiceapplicationIndex.js @@ -331,8 +331,8 @@ Ext.extend(Shipping.MsChInvoiceapplicationIndex, Ext.Panel, { bbar: [Ext.create('Ext.PagingToolbar', { store: this.storeList, displayInfo: true, - displayMsg: '当前显示 {0} - {1}条记录 /共 {2}条记录', - emptyMsg: "没有数据" + displayMsg: Zi.LAN.FenYe, + emptyMsg: Zi.LAN.Nodata }), this.Pagenum] }); @@ -355,12 +355,26 @@ Ext.extend(Shipping.MsChInvoiceapplicationIndex, Ext.Panel, { //#region formSearch枚举参照相关 - this.storeBillStatus = Ext.create('DsExt.ux.RefEnumStore', {}); - this.storeBillStatus.load({ params: { enumTypeId: 97010} }); + var BLTYPEDFIELDNAME = 'EnumValueName'; + if (strLANGUAGES == "en-us") { + BLTYPEDFIELDNAME = 'EnumValueName_2'; + } + + //this.storeBillStatus = Ext.create('DsExt.ux.RefEnumStore', {}); + //this.storeBillStatus.load({ params: { enumTypeId: 97010 } }); + + + this.storeBillStatus = Ext.create('DsExt.ux.RefTableStore', { + model: 'DsExtEnumModel', + proxy: { url: '/CommMng/PubSys/GetEnumValueList' } + }); + this.storeBillStatus.load({ params: { enumTypeId: 97010 } }); - this.comboxBillStatus = Ext.create('DsExt.ux.RefEnumCombox', { + this.comboxBillStatus = Ext.create('DsExt.ux.RefTableCombox', { fieldLabel: Zi.LAN.status, forceSelection: false, + valueField: 'EnumValueName', + displayField: BLTYPEDFIELDNAME, store: this.storeBillStatus, name: 'BillStatus' }); diff --git a/DSWeb/Areas/Account/Viewsjs/Chfee_invoiceapplication/Zi_en-us.js b/DSWeb/Areas/Account/Viewsjs/Chfee_invoiceapplication/Zi_en-us.js index bcd61ff2..4abda995 100644 --- a/DSWeb/Areas/Account/Viewsjs/Chfee_invoiceapplication/Zi_en-us.js +++ b/DSWeb/Areas/Account/Viewsjs/Chfee_invoiceapplication/Zi_en-us.js @@ -15,7 +15,7 @@ Zi.LAN.BUFENKAICHU = "部分开出"; Zi.LAN.YIKAICHU = "已开出"; Zi.LAN.BUHUITIJIAO = "驳回提交"; Zi.LAN.PAYCOMPANYREF = "所属分部"; -Zi.LAN.CUSTOMERNAME = "开票单位"; +Zi.LAN.INVCUSTOMERNAME = "开票单位"; Zi.LAN.INVOICECUSTNAME = "发票抬头"; Zi.LAN.Currency = "币别"; Zi.LAN.APPLYAMOUNT = "申请金额"; diff --git a/DSWeb/Areas/Account/Viewsjs/Chfee_payapplication/ChPayapplicationBLEdit.js b/DSWeb/Areas/Account/Viewsjs/Chfee_payapplication/ChPayapplicationBLEdit.js index 2fbcedee..3d9e945a 100644 --- a/DSWeb/Areas/Account/Viewsjs/Chfee_payapplication/ChPayapplicationBLEdit.js +++ b/DSWeb/Areas/Account/Viewsjs/Chfee_payapplication/ChPayapplicationBLEdit.js @@ -3295,6 +3295,9 @@ Ext.extend(Shipping.MsChPayapplicationBLEdit, Ext.Panel, { } var SALECORPID = this.formEdit.getForm().findField('SALECORPID').getValue(); if ((SALECORPID == '') || (SALECORPID == null)) { + var selectedRecords2 = this.gridAddList.selModel.getSelection(); + var rec = selectedRecords2[i]; + SALECORP = rec.data.SALECORP; var recs = DsStoreQueryBy(this.storeSaleCompany, 'NAME', SALECORP); if (recs.getCount() > 0) { var data = recs.getAt(0).data; diff --git a/DSWeb/Areas/Account/Viewsjs/Chfee_settlement/ChPayAppBLsettlementEdit.js b/DSWeb/Areas/Account/Viewsjs/Chfee_settlement/ChPayAppBLsettlementEdit.js index 53b40e64..79f6fc14 100644 --- a/DSWeb/Areas/Account/Viewsjs/Chfee_settlement/ChPayAppBLsettlementEdit.js +++ b/DSWeb/Areas/Account/Viewsjs/Chfee_settlement/ChPayAppBLsettlementEdit.js @@ -243,6 +243,10 @@ Ext.extend(Shipping.MsChPayAppSettlementEdit, Ext.Panel, { valueField: 'GID', displayField: 'BANKACCOUNT' }); + var BLTYPEDFIELDNAME = 'EnumValueName'; + if (strLANGUAGES == "en-us") { + BLTYPEDFIELDNAME = 'EnumValueName_2'; + } this.storeSTLCATEGROY = Ext.create('DsExt.ux.RefEnumStore', {}); @@ -253,7 +257,7 @@ Ext.extend(Shipping.MsChPayAppSettlementEdit, Ext.Panel, { name: 'STLCATEGROY', store: this.storeSTLCATEGROY, valueField: 'EnumValueName', - displayField: 'EnumValueName', + displayField: BLTYPEDFIELDNAME, forceSelection: true }); diff --git a/DSWeb/Areas/Account/Viewsjs/Chfee_settlement/Zi_en-us.js b/DSWeb/Areas/Account/Viewsjs/Chfee_settlement/Zi_en-us.js index 5636fc7d..32612886 100644 --- a/DSWeb/Areas/Account/Viewsjs/Chfee_settlement/Zi_en-us.js +++ b/DSWeb/Areas/Account/Viewsjs/Chfee_settlement/Zi_en-us.js @@ -339,4 +339,6 @@ Zi.LAN.UNLOCKTIME = "撤销锁定时间"; Zi.LAN.UNLOCKUSERREF = "撤销锁定人"; Zi.LAN.CONTRACTNO = "合同号"; Zi.LAN.INSPECTIONNO = "报检单号"; -Zi.LAN.SALEDEPT = "所属部门"; \ No newline at end of file +Zi.LAN.SALEDEPT = "所属部门"; +Zi.LAN.DR = "收"; +Zi.LAN.CR = "付"; \ No newline at end of file diff --git a/DSWeb/Areas/Account/Viewsjs/Chfee_settlement/Zi_zh-cn.js b/DSWeb/Areas/Account/Viewsjs/Chfee_settlement/Zi_zh-cn.js index aadbcca6..17975fc5 100644 --- a/DSWeb/Areas/Account/Viewsjs/Chfee_settlement/Zi_zh-cn.js +++ b/DSWeb/Areas/Account/Viewsjs/Chfee_settlement/Zi_zh-cn.js @@ -343,4 +343,6 @@ Zi.LAN.UNLOCKTIME = "撤销锁定时间"; Zi.LAN.UNLOCKUSERREF = "撤销锁定人"; Zi.LAN.CONTRACTNO = "合同号"; Zi.LAN.INSPECTIONNO = "报检单号"; -Zi.LAN.SALEDEPT = "所属部门"; \ No newline at end of file +Zi.LAN.SALEDEPT = "所属部门"; +Zi.LAN.DR = "收"; +Zi.LAN.CR = "付"; \ No newline at end of file diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeEdit.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeEdit.js index bcf6ffe1..fbb7f9bb 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeEdit.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeEdit.js @@ -6442,6 +6442,7 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { this.StoreSalesRepCode.add({ "ID": "CN099", "NAME": "CN099 | HELEN ZHANG" }); this.StoreSalesRepCode.add({ "ID": "CN100", "NAME": "CN100 | LEOREN" }); this.StoreSalesRepCode.add({ "ID": "CN302", "NAME": "CN302 | MELL" }); + this.StoreSalesRepCode.add({ "ID": "CN234", "NAME": "CN234 | JACKIE FENG" }); this.comboxSalesRepCode = Ext.create('DsExt.ux.RefTableCombox', { store: this.StoreSalesRepCode,