diff --git a/BookingJieFeng/BookingJieFeng.csproj.user b/BookingJieFeng/BookingJieFeng.csproj.user index a48b3371..28be9c4c 100644 --- a/BookingJieFeng/BookingJieFeng.csproj.user +++ b/BookingJieFeng/BookingJieFeng.csproj.user @@ -1,7 +1,7 @@  - Debug|Any CPU + Release|Any CPU FolderProfile true diff --git a/BookingWeb/BookingWeb.csproj.user b/BookingWeb/BookingWeb.csproj.user index 6bc24ada..4edb5e0f 100644 --- a/BookingWeb/BookingWeb.csproj.user +++ b/BookingWeb/BookingWeb.csproj.user @@ -1,7 +1,7 @@  - Debug|Any CPU + Release|Any CPU true diff --git a/DSWeb/Areas/Account/Viewsjs/Chfee_invoice/ChInvoiceAppEdit.js b/DSWeb/Areas/Account/Viewsjs/Chfee_invoice/ChInvoiceAppEdit.js index f612a31e..5b051c2d 100644 --- a/DSWeb/Areas/Account/Viewsjs/Chfee_invoice/ChInvoiceAppEdit.js +++ b/DSWeb/Areas/Account/Viewsjs/Chfee_invoice/ChInvoiceAppEdit.js @@ -2131,6 +2131,11 @@ Ext.extend(Shipping.MsChInvoiceAppEdit, Ext.Panel, { displayField: 'CodeAndName' }); + var BLTYPEDFIELDNAME = 'EnumValueName'; + if (strLANGUAGES == "en-us") { + BLTYPEDFIELDNAME = 'EnumValueName_2'; + } + this.storeInvCategory = Ext.create('DsExt.ux.RefEnumStore', {}); this.storeInvCategory.load({ params: { enumTypeId: 97008 } }); @@ -2142,7 +2147,7 @@ Ext.extend(Shipping.MsChInvoiceAppEdit, Ext.Panel, { forceSelection: true, name: 'INVOICECATEGORY', valueField: 'EnumValueId', - displayField: 'EnumValueName' + displayField: BLTYPEDFIELDNAME }); diff --git a/DSWeb/Areas/Account/Viewsjs/Chfee_invoice/ChInvoiceIndex.js b/DSWeb/Areas/Account/Viewsjs/Chfee_invoice/ChInvoiceIndex.js index da205b48..300525a6 100644 --- a/DSWeb/Areas/Account/Viewsjs/Chfee_invoice/ChInvoiceIndex.js +++ b/DSWeb/Areas/Account/Viewsjs/Chfee_invoice/ChInvoiceIndex.js @@ -81,9 +81,9 @@ Ext.extend(Shipping.MsChInvoiceIndex, Ext.Panel, { header: Zi.LAN.INVOICETYPEREF, width: 120, renderer: function (value, meta, record) { - if (value == '自由开票') { + if (value == '自由发票') { value = Zi.LAN.FREEINVOICE; - } else if (value == '申请开票') { + } else if (value == '申请发票') { value = Zi.LAN.SHENINVOICE; } return value; diff --git a/DSWeb/Areas/Account/Viewsjs/Chfee_invoice/Zi_en-us.js b/DSWeb/Areas/Account/Viewsjs/Chfee_invoice/Zi_en-us.js index 5a99faaf..7d0cf3ac 100644 --- a/DSWeb/Areas/Account/Viewsjs/Chfee_invoice/Zi_en-us.js +++ b/DSWeb/Areas/Account/Viewsjs/Chfee_invoice/Zi_en-us.js @@ -5,268 +5,268 @@ Ext.ns("Zi.LAN"); //#region MsOpSeae -Zi.LAN.INVOICETYPEREF = "发票类别"; -Zi.LAN.INVOICECATEGORYREF = "类型"; -Zi.LAN.FREEINVOICE = "自由开票"; -Zi.LAN.SHENINVOICE = "申请开票"; -Zi.LAN.COPYADD = "复制添加"; -Zi.LAN.BILLSTATUS = "锁定"; -Zi.LAN.BILLNO = "发票业务编号"; -Zi.LAN.status = "状态"; -Zi.LAN.SHENHETONGGUO = "审核通过"; -Zi.LAN.LURUZHUAGNTAI = "录入状态"; -Zi.LAN.TIJIAOSHENHE = "已提交"; -Zi.LAN.BUFENKAICHU = "部分开出"; -Zi.LAN.YIKAICHU = "已开出"; -Zi.LAN.BUHUITIJIAO = "驳回提交"; -Zi.LAN.PAYCOMPANYREF = "所属分部"; -Zi.LAN.INVCUSTOMERNAME = "开票单位"; -Zi.LAN.INVOICECUSTNAME = "发票抬头"; -Zi.LAN.Currency = "币别"; -Zi.LAN.APPLYAMOUNT = "申请金额"; -Zi.LAN.INVAMOUNT = "开票金额"; -Zi.LAN.AMOUNT = "金额"; -Zi.LAN.ISNEEDPRINT = "是否打印"; -Zi.LAN.ISNEEDFEE = "是否结算"; -Zi.LAN.RECVCURR = "发票币别"; -Zi.LAN.FEEAMOUNT = "原币金额"; -Zi.LAN.APPLYTIME = "申请开票日期"; -Zi.LAN.APPLICANTNAME = "申请人"; -Zi.LAN.INVOICENO = "发票号"; -Zi.LAN.NOSTL = "未结算"; -Zi.LAN.INVOICENOREF = "实际开出发票号"; -Zi.LAN.INVDATE = "开票日期"; -Zi.LAN.FMINVDATE = "从开票日期"; -Zi.LAN.TOINVDATE = "至开票日期"; -Zi.LAN.REMARK = "备注"; -Zi.LAN.OPERATORNAME = "开票人"; -Zi.LAN.APPLICANTDEPT = "所属部门"; -Zi.LAN.SHENREMARK = "开票要求"; -Zi.LAN.NOTAXAMOUNT = "不含税金额"; -Zi.LAN.ISDELETE = "是否作废"; -Zi.LAN.ZUOFEI = "作废"; -Zi.LAN.CANCELZUOFEI = "取消作废"; -Zi.LAN.DELOPERATORNAME = "作废人"; -Zi.LAN.DELETETIME = "作废时间"; -Zi.LAN.CheckIsDelete = "合计含作废金额"; -Zi.LAN.TIJIAOSUODING = "提交锁定"; -Zi.LAN.CANCELSUODING = "撤销锁定"; -Zi.LAN.LOCKUSER = "锁定人"; -Zi.LAN.LOCKTIME = "锁定时间"; -Zi.LAN.INVSHENNO = "申请编号"; -Zi.LAN.VOUCHERNO = "接口凭证"; -Zi.LAN.VOUNO = "凭证"; -Zi.LAN.DZSTATUS = "电子发票"; -Zi.LAN.NOTAXAMOUNT = "不含税金额"; -Zi.LAN.ENTERTIME = "录入时间"; -Zi.LAN.INVOICECATEGORYREF = "申请类型"; -Zi.LAN.RATE = "开票税率"; -Zi.LAN.OPERATETIME = "申请时间"; -Zi.LAN.REASON = "驳回原因"; -Zi.LAN.PUSHMODEREF = "通知推送方式"; -Zi.LAN.PUSHMOBILE = "通知手机"; -Zi.LAN.PUSHEMAIL = "通知邮箱"; -Zi.LAN.APPLYTIMEFM = "从申请日期"; -Zi.LAN.APPLYTIMETO = "到申请日期"; -Zi.LAN.ExecuteQuery = "查询"; -Zi.LAN.ResetCondition = "重置条件"; -Zi.LAN.AdvancedSearch = "高级查询"; -Zi.LAN.BIANHAO = "编号"; -Zi.LAN.xnew = "新建"; -Zi.LAN.tjshe = "提交审核"; -Zi.LAN.cxtijiao = "撤销提交"; -Zi.LAN.delete1 = "删除"; -Zi.LAN.print = "打印"; -Zi.LAN.printList = "打印列表"; -Zi.LAN.printSelect = "打印选中"; -Zi.LAN.ExportExcel = "导出Excel"; -Zi.LAN.Saveliststyle = "保存列表样式"; -Zi.LAN.Save = "保存"; -Zi.LAN.Initialization = "初始化"; -Zi.LAN.onExpInvClick = "发票接口文件导出"; -Zi.LAN.onExpDZInvClick = "发票接口(电子)文件导出"; -Zi.LAN.onExpRYTInvClick = "荣e通"; -Zi.LAN.SetNoPrint = "设置未打印"; -Zi.LAN.xswork = "显示工作流"; -Zi.LAN.NowAudit = "正在审核..."; // -Zi.LAN.NowSelect = "正在查询数据..."; -Zi.LAN.Prompt = "提示"; -Zi.LAN.SelectDanju = "请先选择单据"; -Zi.LAN.SelectError = "查询条件赋值错误，请检查。"; -Zi.LAN.CheckSaveQuery = "记忆查询"; -Zi.LAN.DowloadFile = "下载文件"; -Zi.LAN.nodelete = "当前状态无法删除此单据！"; -Zi.LAN.suredelete = "确定删除该记录吗？"; -Zi.LAN.nowdelete = "正在删除数据..."; -Zi.LAN.truedelete = "删除成功!"; -Zi.LAN.Error = "错误"; -Zi.LAN.FuWuQiError = "服务器响应出错,请重试"; -Zi.LAN.Caveat = "警告"; -Zi.LAN.addnumnow = "正在添加数据..."; -Zi.LAN.qqerror = "请求出现错误,请重试"; -Zi.LAN.Zhengzaisuoding = "正在锁定..."; -Zi.LAN.CUSTBANK = "开户行及账号"; -Zi.LAN.ACTUALCUSTOMERNAME = "代开客户"; -Zi.LAN.CUSTRATENO = "纳税人识别号"; -Zi.LAN.CUSTADDRTEL = "地址、电话"; -Zi.LAN.OTCURRAMOUNT = "外币金额"; -Zi.LAN.ImportRemarks = "提取备注"; -Zi.LAN.SetRemarksTemplate = "模板设置"; -Zi.LAN.sypiao = "上一票"; -Zi.LAN.xypiao = "下一票"; -Zi.LAN.saveandclose = "保存并关闭"; -Zi.LAN.saveandnew = "保存并新建"; -Zi.LAN.btnENew = "新建"; -Zi.LAN.CFPCZWB = "此发票存在外币,确认要申请RMB发票吗?"; -Zi.LAN.LoadData = "数据加载中，请稍等..."; -Zi.LAN.btnAddInvdetail = "添加发票明细"; -Zi.LAN.btndelInvdetail = "删除发票明细"; -Zi.LAN.GOODSNAMEREF = "货物或应税劳务名称"; -Zi.LAN.SPEC = "规格型号"; -Zi.LAN.UNIT = "单位"; -Zi.LAN.PKGS = "数量"; -Zi.LAN.TAXPRICE = "含税单价"; -Zi.LAN.PRICE = "单价"; -Zi.LAN.AMOUNT = "金额"; -Zi.LAN.TAXRATE = "税率"; -Zi.LAN.TAX = "税额"; -Zi.LAN.CUSTNO = "委托编号"; -Zi.LAN.MBLNO = "主提单号"; -Zi.LAN.CUSTOMERNAME = "委托单位"; -Zi.LAN.ETD = "开船日期"; -Zi.LAN.BSSOURCE = "业务来源"; -Zi.LAN.FEENAME = "费用名称"; -Zi.LAN.FEETYPEREF = "收付"; -Zi.LAN.ORIGCURRENCY = "原始币别"; -Zi.LAN.ORIGEXCHANGERATE = "原始汇率"; -Zi.LAN.EXCHANGERATE = "折算汇率"; -Zi.LAN.ACCTAXRATE = "销项/进项税率"; -Zi.LAN.ORIGAMOUNT = "原始金额"; -Zi.LAN.SALE = "揽货人"; -Zi.LAN.SALECORP = "核算单位"; -Zi.LAN.INPUTMODE = "录入方式"; -Zi.LAN.COMPANYNAME = "所属分部"; -Zi.LAN.BANK = "银行及账号"; -Zi.LAN.ENTERP = "经营单位"; -Zi.LAN.ACCDATE = "会计期间"; -Zi.LAN.FEESHENDETAIL = "费用申请明细"; -Zi.LAN.btndeldetail = "删除申请明细"; -Zi.LAN.BSNOSEARCH = "单号"; -Zi.LAN.SHENAMOUNTTOTAL = "申请金额合计"; -Zi.LAN.NumberOfpage = "每页记录数"; -Zi.LAN.ORDERNO = "订舱编号"; -Zi.LAN.FEEOBJNAME = "费用对象"; -Zi.LAN.RMBDrBalAmount = "RMB未开"; -Zi.LAN.USDDrBalAmount = "USD未开"; -Zi.LAN.OTDrBalAmount = "其他未开"; -Zi.LAN.HBLNO = "分提单号"; -Zi.LAN.OPLBNAME = "业务类别"; -Zi.LAN.VOYNO = "航次"; -Zi.LAN.VESSEL = "船名"; -Zi.LAN.OP = "操作"; -Zi.LAN.DOC = "单证"; -Zi.LAN.INPUTBY = "录入人"; -Zi.LAN.PORTLOAD = "起运港"; -Zi.LAN.PORTDISCHARGE = "卸货港"; -Zi.LAN.DESTINATIOIN = "目的港"; -Zi.LAN.FenYe = "当前显示 {0} - {1}条记录 /共 {2}条记录"; -Zi.LAN.Nodata = "没有数据"; -Zi.LAN.InvDetail = "发票明细"; -Zi.LAN.FEESUM = "费用合计"; -Zi.LAN.FEELIST = "费用列表"; -Zi.LAN.BalAmount = "未开票金额"; -Zi.LAN.StlAmount = "本次开票金额"; -Zi.LAN.SelectGrid = "所选费用合计"; -Zi.LAN.All = "全部"; -Zi.LAN.NOAUDIT = "待审核"; -Zi.LAN.AUDIT = "已审核"; -Zi.LAN.DR = "收"; -Zi.LAN.CR = "付"; -Zi.LAN.NOSTLAMOUNT = "未结金额"; -Zi.LAN.STLAMOUNT = "已结金额"; -Zi.LAN.AUDITSTATUS = "审核状态"; -Zi.LAN.FEERANGE = "费用范围"; -Zi.LAN.CUSTOMNO = "报关单号"; -Zi.LAN.TJFASQMX = "添加发票申请明细"; -Zi.LAN.cywdate = "业务日期"; -Zi.LAN.dywdate = "业务日期"; -Zi.LAN.DuiNo = "对账编号"; -Zi.LAN.sqmxi = "申请明细"; -Zi.LAN.FileName = "文件名称"; -Zi.LAN.FileDate = "上传日期"; -Zi.LAN.FilePerson = "上传者"; -Zi.LAN.Operating = "操作"; -Zi.LAN.filetp = "上传文件"; -Zi.LAN.filefujina = "附件上传"; -Zi.LAN.DeleteFile = "删除文件"; -Zi.LAN.FEEDETAIL = "费用明细"; -Zi.LAN.INVSHEN = "发票申请"; -Zi.LAN.onselect = "正在查询主表数据..."; +Zi.LAN.INVOICETYPEREF = "Type of invoice";//"发票类别"; +Zi.LAN.INVOICECATEGORYREF = "type";//"类型"; +Zi.LAN.FREEINVOICE = "Free billing";//"自由开票"; +Zi.LAN.SHENINVOICE = "Apply for billing";//"申请开票"; +Zi.LAN.COPYADD = "";//"复制添加"; +Zi.LAN.BILLSTATUS = "lock";//"锁定"; +Zi.LAN.BILLNO ="Invoice business number";// "发票业务编号"; +Zi.LAN.status = "status";//"状态"; +Zi.LAN.SHENHETONGGUO = "Pass the examination";//"审核通过"; +Zi.LAN.LURUZHUAGNTAI ="Entry status";// "录入状态"; +Zi.LAN.TIJIAOSHENHE = "submitted";//"已提交"; +Zi.LAN.BUFENKAICHU = "Partial departure";//"部分开出"; +Zi.LAN.YIKAICHU = "Have opened";//"已开出"; +Zi.LAN.BUHUITIJIAO = "Reject submission";//"驳回提交"; +Zi.LAN.PAYCOMPANYREF = "subdivision";//"所属分部"; +Zi.LAN.INVCUSTOMERNAME = "Billing unit";//"开票单位"; +Zi.LAN.INVOICECUSTNAME = "Invoice title";//"发票抬头"; +Zi.LAN.Currency = "currency";//"币别"; +Zi.LAN.APPLYAMOUNT = "Amount applied";//"申请金额"; +Zi.LAN.INVAMOUNT = "Invoice amount";//"开票金额"; +Zi.LAN.AMOUNT = "amount";//"金额"; +Zi.LAN.ISNEEDPRINT = "Print or not";//"是否打印"; +Zi.LAN.ISNEEDFEE = "Settlement or not";//"是否结算"; +Zi.LAN.RECVCURR = "Invoice currency";//"发票币别"; +Zi.LAN.FEEAMOUNT = "Original amount";//"原币金额"; +Zi.LAN.APPLYTIME ="Application date for invoicing";// "申请开票日期"; +Zi.LAN.APPLICANTNAME ="applicant";//"申请人"; +Zi.LAN.INVOICENO ="Invoice number";// "发票号"; +Zi.LAN.NOSTL ="unsettled";// "未结算"; +Zi.LAN.INVOICENOREF = "Actual departure ticket number";//"实际开出发票号"; +Zi.LAN.INVDATE ="Date of drawing";// "开票日期"; +Zi.LAN.FMINVDATE = "From the invoicing date";//"从开票日期"; +Zi.LAN.TOINVDATE = "Until the date of invoicing";//"至开票日期"; +Zi.LAN.REMARK = "remark";//"备注"; +Zi.LAN.OPERATORNAME = "drawer";//"开票人"; +Zi.LAN.APPLICANTDEPT = "Subordinate department";//"所属部门"; +Zi.LAN.SHENREMARK = "Billing requirement";//"开票要求"; +Zi.LAN.NOTAXAMOUNT ="Tax not included";// "不含税金额"; +Zi.LAN.ISDELETE ="Void or not";// "是否作废"; +Zi.LAN.ZUOFEI = "void";//"作废"; +Zi.LAN.CANCELZUOFEI ="Cancel and void";// "取消作废"; +Zi.LAN.DELOPERATORNAME ="nullifier";// "作废人"; +Zi.LAN.DELETETIME ="Obsolescence time";// "作废时间"; +Zi.LAN.CheckIsDelete = "Total includes nullification amount";//"合计含作废金额"; +Zi.LAN.TIJIAOSUODING = "Commit lock";//"提交锁定"; +Zi.LAN.CANCELSUODING = "Undo lock";//"撤销锁定"; +Zi.LAN.LOCKUSER ="lock-up";// "锁定人"; +Zi.LAN.LOCKTIME = "Lock time";//"锁定时间"; +Zi.LAN.INVSHENNO ="Application number";// "申请编号"; +Zi.LAN.VOUCHERNO = "Interface certificate";//"接口凭证"; +Zi.LAN.VOUNO = "proof";//"凭证"; +Zi.LAN.DZSTATUS ="Electronic invoice";// "电子发票"; +Zi.LAN.NOTAXAMOUNT = "Tax not included";//"不含税金额"; +Zi.LAN.ENTERTIME ="Entry time";// "录入时间"; +Zi.LAN.INVOICECATEGORYREF ="Application type";// "申请类型"; +Zi.LAN.RATE ="Billing rate";// "开票税率"; +Zi.LAN.OPERATETIME = "Application time";//"申请时间"; +Zi.LAN.REASON ="Cause of rejection";// "驳回原因"; +Zi.LAN.PUSHMODEREF ="Notification push mode";// "通知推送方式"; +Zi.LAN.PUSHMOBILE ="Notification phone";// "通知手机"; +Zi.LAN.PUSHEMAIL = "Notification mailbox";//"通知邮箱"; +Zi.LAN.APPLYTIMEFM = "From date of application";//"从申请日期"; +Zi.LAN.APPLYTIMETO ="By the date of application";// "到申请日期"; +Zi.LAN.ExecuteQuery = "inquire";//"查询"; +Zi.LAN.ResetCondition = "Reset condition";//"重置条件"; +Zi.LAN.AdvancedSearch = "Advanced query";//"高级查询"; +Zi.LAN.BIANHAO ="ID";// "编号"; +Zi.LAN.xnew ="new";// "新建"; +Zi.LAN.tjshe ="Submit for review";// "提交审核"; +Zi.LAN.cxtijiao ="Withdraw submission";// "撤销提交"; +Zi.LAN.delete1 = "delete";//"删除"; +Zi.LAN.print = "print";//"打印"; +Zi.LAN.printList = "Print list";//"打印列表"; +Zi.LAN.printSelect = "Print check";//"打印选中"; +Zi.LAN.ExportExcel = "Export Excel";//"导出Excel"; +Zi.LAN.Saveliststyle ="Save list style";// "保存列表样式"; +Zi.LAN.Save = "save";//"保存"; +Zi.LAN.Initialization = "initialize";//"初始化"; +Zi.LAN.onExpInvClick ="Export the invoice interface file";// "发票接口文件导出"; +Zi.LAN.onExpDZInvClick = "Invoice interface (electronic) file export";//"发票接口(电子)文件导出"; +Zi.LAN.onExpRYTInvClick = "Rong Etong";//"荣e通"; +Zi.LAN.SetNoPrint ="Set not print";//"设置未打印"; +Zi.LAN.xswork ="Display workflow";// "显示工作流"; +Zi.LAN.NowAudit = "Under review";//"正在审核..."; // +Zi.LAN.NowSelect = "Querying data";//"正在查询数据..."; +Zi.LAN.Prompt ="Tips";// "提示"; +Zi.LAN.SelectDanju = "Please select the document first";//"请先选择单据"; +Zi.LAN.SelectError = "Query condition assignment error, please check";//"查询条件赋值错误，请检查。"; +Zi.LAN.CheckSaveQuery = "Memory query";//"记忆查询"; +Zi.LAN.DowloadFile = "Download file";//"下载文件"; +Zi.LAN.nodelete = "The current status cannot delete this document!";//"当前状态无法删除此单据！"; +Zi.LAN.suredelete = "Are you sure to delete this record?";//"确定删除该记录吗？"; +Zi.LAN.nowdelete = "Deleting data...";//"正在删除数据..."; +Zi.LAN.truedelete = "Deleted successfully!";//"删除成功!"; +Zi.LAN.Error ="mistake";// "错误"; +Zi.LAN.FuWuQiError = "Server response error, please try again";//"服务器响应出错,请重试"; +Zi.LAN.Caveat = "warn";//"警告"; +Zi.LAN.addnumnow = "Adding data...";//"正在添加数据..."; +Zi.LAN.qqerror = "An error occurred. Please try again";//"请求出现错误,请重试"; +Zi.LAN.Zhengzaisuoding = "Locking...";//"正在锁定..."; +Zi.LAN.CUSTBANK = "Opening bank and account number";//"开户行及账号"; +Zi.LAN.ACTUALCUSTOMERNAME = "agent";//"代开客户"; +Zi.LAN.CUSTRATENO = "Taxpayer identification number";//"纳税人识别号"; +Zi.LAN.CUSTADDRTEL = "Address, telephone";//"地址、电话"; +Zi.LAN.OTCURRAMOUNT = "Amount of foreign currency";//"外币金额"; +Zi.LAN.ImportRemarks ="Extract remarks";// "提取备注"; +Zi.LAN.SetRemarksTemplate = "Template Settings";//"模板设置"; +Zi.LAN.sypiao ="Previous vote";// "上一票"; +Zi.LAN.xypiao = "Next vote";//"下一票"; +Zi.LAN.saveandclose ="Save and close";// "保存并关闭"; +Zi.LAN.saveandnew ="Save and new";// "保存并新建"; +Zi.LAN.btnENew = "new";//"新建"; +Zi.LAN.CFPCZWB = "This invoice contains foreign currency. Do you want to apply for RMB invoice?";//"此发票存在外币,确认要申请RMB发票吗?"; +Zi.LAN.LoadData = "Data loading, please wait...";//"数据加载中，请稍等..."; +Zi.LAN.btnAddInvdetail = "Add invoice details";//"添加发票明细"; +Zi.LAN.btndelInvdetail = "Delete invoice details";//"删除发票明细"; +Zi.LAN.GOODSNAMEREF = "Name of goods or taxable services";//"货物或应税劳务名称"; +Zi.LAN.SPEC ="Specification and model";// "规格型号"; +Zi.LAN.UNIT ="unit";// "单位"; +Zi.LAN.PKGS = "quantity";//"数量"; +Zi.LAN.TAXPRICE = "Unit price including tax";//"含税单价"; +Zi.LAN.PRICE ="Unit price";// "单价"; +Zi.LAN.AMOUNT = "amount";//"金额"; +Zi.LAN.TAXRATE = "Tax rate";//"税率"; +Zi.LAN.TAX ="The amount of tax payable";// "税额"; +Zi.LAN.CUSTNO ="Order number";// "委托编号"; +Zi.LAN.MBLNO = "Master bill of lading number";//"主提单号"; +Zi.LAN.CUSTOMERNAME ="Entrusted unit";// "委托单位"; +Zi.LAN.ETD = "Sailing date";//"开船日期"; +Zi.LAN.BSSOURCE = "Business source";//"业务来源"; +Zi.LAN.FEENAME = "Fee name";//"费用名称"; +Zi.LAN.FEETYPEREF = "Receipt and payment";//"收付"; +Zi.LAN.ORIGCURRENCY ="Original currency";// "原始币别"; +Zi.LAN.ORIGEXCHANGERATE = "Original exchange rate";//"原始汇率"; +Zi.LAN.EXCHANGERATE ="Converted exchange rate";// "折算汇率"; +Zi.LAN.ACCTAXRATE = "Output/input tax rate";//"销项/进项税率"; +Zi.LAN.ORIGAMOUNT = "Original amount";//"原始金额"; +Zi.LAN.SALE = "Freight solicitor";//"揽货人"; +Zi.LAN.SALECORP = "Accounting unit";//"核算单位"; +Zi.LAN.INPUTMODE = "Input mode";//"录入方式"; +Zi.LAN.COMPANYNAME = "subdivision";//"所属分部"; +Zi.LAN.BANK = "Bank and account number";//"银行及账号"; +Zi.LAN.ENTERP = "Business unit";//"经营单位"; +Zi.LAN.ACCDATE = "Accounting period";//"会计期间"; +Zi.LAN.FEESHENDETAIL = "Expense claim details";//"费用申请明细"; +Zi.LAN.btndeldetail = "Delete request details";//"删除申请明细"; +Zi.LAN.BSNOSEARCH ="Odd number";// "单号"; +Zi.LAN.SHENAMOUNTTOTAL ="Total amount applied";// "申请金额合计"; +Zi.LAN.NumberOfpage = "Records per page";//"每页记录数"; +Zi.LAN.ORDERNO = "Booking number";//"订舱编号"; +Zi.LAN.FEEOBJNAME ="Cost object";// "费用对象"; +Zi.LAN.RMBDrBalAmount ="RMB not opened";// "RMB未开"; +Zi.LAN.USDDrBalAmount = "USD not opened";//"USD未开"; +Zi.LAN.OTDrBalAmount = "Other open";//"其他未开"; +Zi.LAN.HBLNO ="Sub-bill of lading number";// "分提单号"; +Zi.LAN.OPLBNAME ="Business class";// "业务类别"; +Zi.LAN.VOYNO = "Voyage or flight number";//"航次"; +Zi.LAN.VESSEL = "Ship's name";//"船名"; +Zi.LAN.OP = "Controls";//"操作"; +Zi.LAN.DOC = "document";//"单证"; +Zi.LAN.INPUTBY = "Entry clerk";//"录入人"; +Zi.LAN.PORTLOAD = "Port of shipment";//"起运港"; +Zi.LAN.PORTDISCHARGE = "Port of discharge";//"卸货港"; +Zi.LAN.DESTINATIOIN ="Port of destination";// "目的港"; +Zi.LAN.FenYe = "Currently, {0} - {1} records are displayed/a total of {2} records are displayed";//"当前显示 {0} - {1}条记录 /共 {2}条记录"; +Zi.LAN.Nodata = "No data";//"没有数据"; +Zi.LAN.InvDetail = "Invoice detail";//"发票明细"; +Zi.LAN.FEESUM = "Total cost";//"费用合计"; +Zi.LAN.FEELIST ="List of expenses";// "费用列表"; +Zi.LAN.BalAmount ="Unbilled amount";// "未开票金额"; +Zi.LAN.StlAmount ="The amount of this invoice";// "本次开票金额"; +Zi.LAN.SelectGrid ="Total of selected costs";// "所选费用合计"; +Zi.LAN.All ="All";// "全部"; +Zi.LAN.NOAUDIT = "To be reviewed";//"待审核"; +Zi.LAN.AUDIT = "audited";//"已审核"; +Zi.LAN.DR = "closed";//"收"; +Zi.LAN.CR = "pay";//"付"; +Zi.LAN.NOSTLAMOUNT = "Outstanding amount";//"未结金额"; +Zi.LAN.STLAMOUNT ="Settled amount";// "已结金额"; +Zi.LAN.AUDITSTATUS = "Audit status";//"审核状态"; +Zi.LAN.FEERANGE = "Cost range";//"费用范围"; +Zi.LAN.CUSTOMNO ="Customs declaration number";//"报关单号"; +Zi.LAN.TJFASQMX ="Add invoice request details";// "添加发票申请明细"; +Zi.LAN.cywdate = "Business date";//"业务日期"; +Zi.LAN.dywdate = "Business date";//"业务日期"; +Zi.LAN.DuiNo = "Reconciliation number";//"对账编号"; +Zi.LAN.sqmxi ="Application details";// "申请明细"; +Zi.LAN.FileName = "File name";//"文件名称"; +Zi.LAN.FileDate ="Upload date";// "上传日期"; +Zi.LAN.FilePerson = "uploader";//"上传者"; +Zi.LAN.Operating ="Controls";// "操作"; +Zi.LAN.filetp = "Upload file";//"上传文件"; +Zi.LAN.filefujina ="Attachment upload";// "附件上传"; +Zi.LAN.DeleteFile = "Delete file";//"删除文件"; +Zi.LAN.FEEDETAIL = "Expense detail";//"费用明细"; +Zi.LAN.INVSHEN = "Invoice application";//"发票申请"; +Zi.LAN.onselect = "Querying primary table data...";//"正在查询主表数据..."; -Zi.LAN.bibiezesuan = "币别汇率折算"; -Zi.LAN.asure = "确定"; -Zi.LAN.surezesuanhuil = "必须填折算汇率!"; -Zi.LAN.close = "关闭"; -Zi.LAN.WUTJFPSQFYMX = "无添加发票申请费用明细！"; -Zi.LAN.Msg_SavingAndWait = "正在保存数据, 请稍侯.."; -Zi.LAN.Msg_Saving = "正在保存数据..."; -Zi.LAN.WSQJEBNDYWSJN = "申请金额不能大于未申金额!"; -Zi.LAN.PlsSave = "请先保存业务信息再添加发票明细！"; -Zi.LAN.StatusCantadd = "当前状态无法添加发票申请明细!"; -Zi.LAN.acctaxratenotinvtax = "费用进项税率与发票申请税率不一致,不能添加此费用明细!"; -Zi.LAN.FEEOBJNAMENOTSAME = "费用对象与开票客户不一致,不能添加此费用明细!"; -Zi.LAN.NOTSELECTADD = "没有选择要添加的业务!"; -Zi.LAN.NOTSELECTDELETE = "没有要删除的费用明细!"; -Zi.LAN.StatusCantDELETE = "当前状态无法删除发票申请明细!"; -Zi.LAN.PlsSaveafterSubmit = "请先保存发票申请!"; -Zi.LAN.StatusCantSUBMIT = "当前状态无法提交!"; -Zi.LAN.NODETAILCantSUBMIT = "没有申请明细,无法提交审核!"; -Zi.LAN.StatusCantNOSUBMIT = "当前状态无法撤销提交!"; -Zi.LAN.INVREMARK = "发票备注"; -Zi.LAN.INVTEMPLATE = "发票备注模板"; -Zi.LAN.IMPORTINVTEMPLATE = "提取发票备注"; -Zi.LAN.ISADDINVREMARK = "是否追加"; -Zi.LAN.INVFEEDETAIL = "申请费用明细"; -Zi.LAN.NOSHENHEQUANXIAN = "你没有审核此申请的权限!"; -Zi.LAN.STATUSNOAUDIT = "当前状态不允许审核!"; -Zi.LAN.NODATATOAUDIT = "没有要审核的申请!"; -Zi.LAN.QUESHIYAOSHENHEXUANZHONG = "确定审核通过选中的业务吗？"; -Zi.LAN.ZHENGZAISHENHE = "正在审核数据..."; -Zi.LAN.STATUSNOBOHUI = "当前状态不允许驳回!"; -Zi.LAN.BOHUIYUANYIN = "请输入驳回原因!"; -Zi.LAN.ZHENGZAIBOHUI = "正在驳回数据..."; -Zi.LAN.BOHUICHENGGONG = "驳回成功！"; -Zi.LAN.YISUODING = "已锁定，无法删除或作废!！"; -Zi.LAN.YISHENGCHENGPINGZHENG = "已生成凭证，无法删除或作废!！"; -Zi.LAN.YIZUOFEI = "已作废！"; -Zi.LAN.YIJIESUAN = "已结算，无法删除或作废!"; -Zi.LAN.DANQIANZHUANGTAIWUFAZUOFEI = "当前状态无法取消作废!"; -Zi.LAN.QUESHIYAOZUOFEI = "确定要取消作废吗？"; -Zi.LAN.AMOUNTCAPITAL = "金额合计(大写)"; -Zi.LAN.SETTLEMENT = "结算金额"; -Zi.LAN.INVAMOUNTTOTAL = "开票金额合计"; -Zi.LAN.CustomerName = "客户名称"; -Zi.LAN.Tjfpfymx = "添加发票费用明细"; -Zi.LAN.AUDITDATE = "审核日期"; -Zi.LAN.FEIYONGMINGXI = "费用明细"; -Zi.LAN.INVSHENDETAIL = "发票申请明细"; -Zi.LAN.panelInv = "发票明细"; -Zi.LAN.xuanzhong = "选中"; -Zi.LAN.jipiao = "票业务"; -Zi.LAN.fpkc = "发票开出"; -Zi.LAN.ydywfxg = "已打印无法修改此发票,只能作废!"; -Zi.LAN.yscjkpzwfxg = "已生成接口凭证无法修改此发票!"; -Zi.LAN.ysczzpzwfxg = "已生成总账凭证无法修改此发票!"; -Zi.LAN.yszfwfxg = "已作废无法修改此发票!"; -Zi.LAN.bbbnwk = "币别不能为空!"; -Zi.LAN.qdyscxzdmx = "确定要删除选中的明细吗？"; -Zi.LAN.yscfamy = "已生成发票，没有需要添加的发票申请!" -Zi.LAN.fyjxslbyz = "费用进项税率与发票申请税率不一致,不能添加此费用明细!"; -Zi.LAN.fydxkpkhbyz = "费用对象与开票客户不一致,不能添加此费用明细!"; -Zi.LAN.myytjdfpmx = "没有要添加的费用明细!"; -Zi.LAN.qxbcfpcnsd = "请先保存发票，然后才能锁定!"; -Zi.LAN.dqztwfsd = "当前状态无法锁定!"; -Zi.LAN.dqztwfcxsd = "当前状态无法撤销锁定!"; -Zi.LAN.bbyfqsqbyz = "币别与发票申请币别不一致,不能添加此费用明细!"; -Zi.LAN.LOCK = "锁定"; -Zi.LAN.UNLOCK = "未锁定"; +Zi.LAN.bibiezesuan ="Exchange rate translation";//"币别汇率折算"; +Zi.LAN.asure = "Sure";//"确定"; +Zi.LAN.surezesuanhuil ="The converted exchange rate must be entered!";//"必须填折算汇率!"; +Zi.LAN.close = "Close";//"关闭"; +Zi.LAN.WUTJFPSQFYMX ="No invoice application fee details are added";//"无添加发票申请费用明细！"; +Zi.LAN.Msg_SavingAndWait ="Saving data, please wait...";//"正在保存数据, 请稍侯.."; +Zi.LAN.Msg_Saving ="Saving data...";//"正在保存数据..."; +Zi.LAN.WSQJEBNDYWSJN = "The requested amount cannot be greater than the unclaimed amount!";//"申请金额不能大于未申金额!"; +Zi.LAN.PlsSave ="Please save the business information before adding the invoice details!";//"请先保存业务信息再添加发票明细！"; +Zi.LAN.StatusCantadd ="The current status cannot add invoice application details!";//"当前状态无法添加发票申请明细!"; +Zi.LAN.acctaxratenotinvtax ="The input tax rate of the fee is inconsistent with the tax rate applied for the invoice, so this fee detail cannot be added!";//"费用进项税率与发票申请税率不一致,不能添加此费用明细!"; +Zi.LAN.FEEOBJNAMENOTSAME ="The fee object is not consistent with the invoicing customer, cannot add this fee detail!";//"费用对象与开票客户不一致,不能添加此费用明细!"; +Zi.LAN.NOTSELECTADD = "No business selected to add!";//"没有选择要添加的业务!"; +Zi.LAN.NOTSELECTDELETE = "No fee details to delete!";//"没有要删除的费用明细!"; +Zi.LAN.StatusCantDELETE ="The current status cannot delete the invoice request details!";//"当前状态无法删除发票申请明细!"; +Zi.LAN.PlsSaveafterSubmit = "Please save the invoice application first!";//"请先保存发票申请!"; +Zi.LAN.StatusCantSUBMIT = "The current status cannot be submitted!";//"当前状态无法提交!"; +Zi.LAN.NODETAILCantSUBMIT = "No application details, can not be submitted for review!";//"没有申请明细,无法提交审核!"; +Zi.LAN.StatusCantNOSUBMIT = "The current state cannot undo the submission!";//"当前状态无法撤销提交!"; +Zi.LAN.INVREMARK ="Invoice remarks";//"发票备注"; +Zi.LAN.INVTEMPLATE = "Invoice remarks template";//"发票备注模板"; +Zi.LAN.IMPORTINVTEMPLATE = "Extract invoice remarks";//"提取发票备注"; +Zi.LAN.ISADDINVREMARK = "Add";//"是否追加"; +Zi.LAN.INVFEEDETAIL = "Application fee details";//"申请费用明细"; +Zi.LAN.NOSHENHEQUANXIAN = "You do not have permission to review this application!";//"你没有审核此申请的权限!"; +Zi.LAN.STATUSNOAUDIT ="The current status does not allow auditing!";//"当前状态不允许审核!"; +Zi.LAN.NODATATOAUDIT = "No applications to review!";//"没有要审核的申请!"; +Zi.LAN.QUESHIYAOSHENHEXUANZHONG = "Are you sure that the selected business is approved?";//"确定审核通过选中的业务吗？"; +Zi.LAN.ZHENGZAISHENHE = "Data being reviewed...";//"正在审核数据..."; +Zi.LAN.STATUSNOBOHUI = "The current status does not allow dismissal!";//"当前状态不允许驳回!"; +Zi.LAN.BOHUIYUANYIN = "Please enter the reason for rejection!";//"请输入驳回原因!"; +Zi.LAN.ZHENGZAIBOHUI = "Is rejecting data...";//"正在驳回数据..."; +Zi.LAN.BOHUICHENGGONG ="Dismissed successfully!";//"驳回成功！"; +Zi.LAN.YISUODING ="Locked, cannot be deleted or invalidated!";//"已锁定，无法删除或作废!！"; +Zi.LAN.YISHENGCHENGPINGZHENG = "";//"已生成凭证，无法删除或作废!！"; +Zi.LAN.YIZUOFEI ="Have been voided!";//"已作废！"; +Zi.LAN.YIJIESUAN ="Settled, cannot be deleted or voided!";// "已结算，无法删除或作废!"; +Zi.LAN.DANQIANZHUANGTAIWUFAZUOFEI ="The current status cannot be cancelled!";//"当前状态无法取消作废!"; +Zi.LAN.QUESHIYAOZUOFEI = "Are you sure you want to cancel it?";//"确定要取消作废吗？"; +Zi.LAN.AMOUNTCAPITAL = "Total amount (in words)";//"金额合计(大写)"; +Zi.LAN.SETTLEMENT = "Settlement amount";//"结算金额"; +Zi.LAN.INVAMOUNTTOTAL ="Total invoicing amount";// "开票金额合计"; +Zi.LAN.CustomerName ="Customer name";// "客户名称"; +Zi.LAN.Tjfpfymx ="Add invoice cost details";//"添加发票费用明细"; +Zi.LAN.AUDITDATE ="Date of approval";//"审核日期"; +Zi.LAN.FEIYONGMINGXI =" Expense Detail";//"费用明细"; +Zi.LAN.INVSHENDETAIL ="Invoice request details";//"发票申请明细"; +Zi.LAN.panelInv = "Invoice detail";//"发票明细"; +Zi.LAN.xuanzhong ="Selected";//"选中"; +Zi.LAN.jipiao ="-ticket service";//"票业务"; +Zi.LAN.fpkc ="Invoice";//"发票开出"; +Zi.LAN.ydywfxg = "This invoice has been printed and cannot be modified, it can only be cancelled!";//"已打印无法修改此发票,只能作废!"; +Zi.LAN.yscjkpzwfxg = "Interface certificate generated cannot modify this invoice!";//"已生成接口凭证无法修改此发票!"; +Zi.LAN.ysczzpzwfxg ="This invoice cannot be modified with a generated general ledger voucher!";//"已生成总账凭证无法修改此发票!"; +Zi.LAN.yszfwfxg ="This invoice is invalid and cannot be modified!";//"已作废无法修改此发票!"; +Zi.LAN.bbbnwk ="Coins can't be empty!";//"币别不能为空!"; +Zi.LAN.qdyscxzdmx = "Are you sure you want to delete the selected details?";//"确定要删除选中的明细吗？"; +Zi.LAN.yscfamy ="Invoices have been generated, no invoice applications need to be added!";//"已生成发票，没有需要添加的发票申请!" +Zi.LAN.fyjxslbyz ="The input tax rate of the fee is inconsistent with the tax rate applied for the invoice, so this fee detail cannot be added!";//"费用进项税率与发票申请税率不一致,不能添加此费用明细!"; +Zi.LAN.fydxkpkhbyz = "The fee object is not consistent with the invoicing customer, cannot add this fee detail!";//"费用对象与开票客户不一致,不能添加此费用明细!"; +Zi.LAN.myytjdfpmx = "No cost details to add!";//"没有要添加的费用明细!"; +Zi.LAN.qxbcfpcnsd = "Please save the invoice before you lock it!";//"请先保存发票，然后才能锁定!"; +Zi.LAN.dqztwfsd = "Current status cannot be locked!";//"当前状态无法锁定!"; +Zi.LAN.dqztwfcxsd = "The current state cannot undo the lock!";//"当前状态无法撤销锁定!"; +Zi.LAN.bbyfqsqbyz ="The currency is different from the requested currency of the invoice, so this fee detail cannot be added!";// "币别与发票申请币别不一致,不能添加此费用明细!"; +Zi.LAN.LOCK ="Lock";// "锁定"; +Zi.LAN.UNLOCK = "Unlock";//"未锁定"; diff --git a/DSWeb/Areas/Account/Viewsjs/Chfee_invoiceapplication/ChInvoiceapplicationIndex.js b/DSWeb/Areas/Account/Viewsjs/Chfee_invoiceapplication/ChInvoiceapplicationIndex.js index 4612553d..59e08528 100644 --- a/DSWeb/Areas/Account/Viewsjs/Chfee_invoiceapplication/ChInvoiceapplicationIndex.js +++ b/DSWeb/Areas/Account/Viewsjs/Chfee_invoiceapplication/ChInvoiceapplicationIndex.js @@ -41,7 +41,7 @@ Ext.extend(Shipping.MsChInvoiceapplicationIndex, Ext.Panel, { this.Pagenum = Ext.create('Ext.form.field.Number', { name: 'bottles', - fieldLabel: '每页记录数', + fieldLabel: Zi.LAN.NumberOfpage, labelAlign: 'right', value: this.PageSize, maxValue: 100000, diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpReceipt/Zi_en-us.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpReceipt/Zi_en-us.js index 9595b068..a4eebf81 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpReceipt/Zi_en-us.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpReceipt/Zi_en-us.js @@ -3,92 +3,118 @@ // 自定义多国语言动态加载方法 Ext.ns("Zi.LAN"); -Zi.LAN.REMARK = "备注"; -Zi.LAN.displayMsg = "当前显示 {0} - {1}条记录 /共 {2}条记录"; -Zi.LAN.ShuJuJiaZaiZhongQingShaoDeng = "数据加载中，请稍等..."; -Zi.LAN.btntest = "保存列表样式"; -Zi.LAN.SaveGridPanel = "保存"; -Zi.LAN.SaveGridPanel2 = "初始化"; -Zi.LAN.btnprint = "打印"; -Zi.LAN.Print = "全部"; -Zi.LAN.PrintSelect = "选择打印"; -Zi.LAN.emptyMsg = "没有数据"; -Zi.LAN.XinJian = "新建"; -Zi.LAN.ShanChu = "删除"; -Zi.LAN.BaoCun = "保存"; -Zi.LAN.ZhiXingChaXun = "执行查询"; -Zi.LAN.ChongZhi = "重置条件"; -Zi.LAN.Gengduo = "更多"; -Zi.LAN.WeiXinTongZhi = "微信通知客户"; -Zi.LAN.ZhengZaiCaoZuoShuJu = "正在操作数据, 请稍侯..."; -Zi.LAN.ZhengZaiChaXunShuJu = "正在查询数据..."; -Zi.LAN.QueDingShanChuGaiJiLuMa = "确定删除该记录吗？"; -Zi.LAN.TiShi = "提示"; -Zi.LAN.ChuoWu = "错误"; -Zi.LAN.GuanBi = "关闭"; -Zi.LAN.FuWuQiXiangYingChuCuo = "服务器响应出错,请重试"; -Zi.LAN.ZhuangTaiBuNengWeiKongBuNengBaoCun = "状态不能为空，请修改后再保存"; -Zi.LAN.QueDingYaoFaSongZhuangTaiMa = "确定要选中状态发送给客户吗？"; -Zi.LAN.bottles = "每页记录数"; -Zi.LAN.QingXuanZeYeWu = "请先选择业务!"; -Zi.LAN.RECEIPTNO = "单据编号"; -Zi.LAN.RECEIPTTYPE = "单据类型"; -Zi.LAN.DOCNUM = "单据份数"; -Zi.LAN.RECEIVE_MAN = "接单人"; -Zi.LAN.RECEIVE_DATE = "接单日期"; -Zi.LAN.SEND_MAN = "送单人"; -Zi.LAN.SEND_DATE = "送单日期"; -Zi.LAN.TRANCER = "送单快递公司"; -Zi.LAN.TRANCNO = "送单快递单号"; -Zi.LAN.ISREPEAT = "是否回单"; -Zi.LAN.REPEAT_MAN = "回单人"; -Zi.LAN.REPEAT_DATE = "回单日期"; -Zi.LAN.ISRECEIVE = "是否还单"; -Zi.LAN.RETURN_MAN = "还单人"; -Zi.LAN.RETURN_DATE = "还单日期"; -Zi.LAN.RETURN_TRANCER = "还单的快递公司"; -Zi.LAN.RETURN_TRANCNO = "还单的快递单号"; -Zi.LAN.CUSTOMDATE = "报关日期"; -Zi.LAN.CUSTOMERNAME = "委托单位"; -Zi.LAN.CUSTFULLNAME = "委托单位全称"; -Zi.LAN.CUSTNO = "委托编号"; -Zi.LAN.CUSTOMNO = "报关单号"; -Zi.LAN.ENTERP = "经营单位"; -Zi.LAN.MBLNO = "主提单号"; -Zi.LAN.HBLNO = "分提单号"; -Zi.LAN.ETD = "开船日期"; -Zi.LAN.VESSEL = "船名"; -Zi.LAN.VOYNO = "航次"; -Zi.LAN.SALE = "揽货人"; -Zi.LAN.DOC = "单证"; -Zi.LAN.OP = "操作"; -Zi.LAN.CUSTSERVICE = "客服"; -Zi.LAN.FRCUSTSERVICE = "海外客服"; -Zi.LAN.CONTRACTNO = "运费协议号"; -Zi.LAN.PORTLOAD = "起运港"; -Zi.LAN.PORTDISCHARGE = "卸货港"; -Zi.LAN.DESTINATION = "目的地"; -Zi.LAN.ACCDATE = "会计期间"; -Zi.LAN.CARRIER = "船公司"; -Zi.LAN.LANE = "航线"; -Zi.LAN.BSSOURCE = "业务来源"; -Zi.LAN.YARD = "场站"; -Zi.LAN.FORWARDER = "订舱代理"; -Zi.LAN.BsType = "运输类型"; -Zi.LAN.TRANSTYPE = "运输类型"; -Zi.LAN.LANE = "航线"; -Zi.LAN.QueRenSongDan = "确认送单"; -Zi.LAN.QuXiaoSongDan = "取消送单"; -Zi.LAN.QueRenHuiDan = "确认回单"; -Zi.LAN.QuXiaoHuiDan = "取消回单"; -Zi.LAN.QueRenHuanDan = "确认还单"; -Zi.LAN.QuXiaoHuanDan = "取消还单"; -Zi.LAN.FANWEI = "范围"; -Zi.LAN.XUANZHONG = "选中"; -Zi.LAN.QUANBU = "全部"; -Zi.LAN.DeleteSuccess = "Successfully deleted"; -Zi.LAN.DeleteErro = "Delete Erro!"; - +Zi.LAN.REMARK = "Remark";//"备注"; +Zi.LAN.displayMsg = "Record {0} - {1} /Total {2} Records";//"当前显示 {0} - {1}条记录 /共 {2}条记录"; +Zi.LAN.ShuJuJiaZaiZhongQingShaoDeng = "Data loading, please wait...";//"数据加载中，请稍等..."; +Zi.LAN.btntest = "Save List Style";//"保存列表样式"; +Zi.LAN.SaveGridPanel = "Save";//"保存"; +Zi.LAN.SaveGridPanel2 = "Initialization";//"初始化"; +Zi.LAN.btnprint = "Print";//"打印"; +Zi.LAN.Print = "All";//"全部"; +Zi.LAN.PrintSelect = "Select Print";//"选择打印"; +Zi.LAN.emptyMsg = "No Data";//"没有数据"; +Zi.LAN.XinJian = "New";//"新建"; +Zi.LAN.ShanChu = "Delete";//"删除"; +Zi.LAN.BaoCun = "Save";//"保存"; +Zi.LAN.ShuaXin = "Refresh";//"刷新"; +Zi.LAN.CheXiao = "revocation";//"撤销"; +Zi.LAN.ZhiXingChaXun = "Query"; //"执行查询"; +Zi.LAN.ChongZhi = "Reset"; //"重置条件"; +Zi.LAN.Gengduo = "More";//"更多"; +Zi.LAN.WeiXinTongZhi = "";//"微信通知客户"; +Zi.LAN.ZhengZaiCaoZuoShuJu = "Handling data, please wait...";//"正在操作数据, 请稍侯..."; +Zi.LAN.ZhengZaiChaXunShuJu = "Be Querying..."; //"正在查询数据..."; +Zi.LAN.QingXuanZeYaoShanChuDeJiLu = "Please select the record you want to delete...";//"请选择要删除的记录..."; +Zi.LAN.QueDingShanChuGaiJiLuMa = "Are you sure to delete this record?";//"确定删除该记录吗？"; +Zi.LAN.ZhengZaiBaoCunShuJu = "Saving data...";//"正在保存数据..."; +Zi.LAN.TiShi = "Hint";//"提示"; +Zi.LAN.ChuoWu = "Error";//"错误"; +Zi.LAN.GuanBi = "Close";//"关闭"; +Zi.LAN.FuWuQiXiangYingChuCuo = "Server response error, please try again";//"服务器响应出错,请重试"; +Zi.LAN.ZhuangTaiBuNengWeiKongBuNengBaoCun = "The status cannot be empty. Change it and save it";//"状态不能为空，请修改后再保存"; +Zi.LAN.QueDingYaoFaSongZhuangTaiMa = "Are you sure you want to send the selected status to the client?";//"确定要选中状态发送给客户吗？"; +Zi.LAN.bottles = "Records Per Page";//"每页记录数"; +Zi.LAN.QingXuanZeYeWu = "Please select information!";//"请先选择业务!"; +Zi.LAN.RECEIPTNO = "Document No";//"单据编号"; +Zi.LAN.RECEIPTTYPE = "Document Type";//"单据类型"; +Zi.LAN.DOCNUM = "Number Of Documents";//"单据份数"; +Zi.LAN.RECEIVE_MAN = "Project Received By";//"接单人"; +Zi.LAN.RECEIVE_DATE = "Order Receiving Date";//"接单日期"; +Zi.LAN.SEND_MAN = "Order Delivery By";//"送单人"; +Zi.LAN.SEND_DATE = "Order Delivery Date";//"送单日期"; +Zi.LAN.TRANCER = "Order Delivery Express Company";//"送单快递公司"; +Zi.LAN.TRANCNO = "Order Delivery Express Number";//"送单快递单号"; +Zi.LAN.ISREPEAT = "Receipt Or Not";//"是否回单"; +Zi.LAN.REPEAT_MAN = "Trade Circular By";//"回单人"; +Zi.LAN.REPEAT_DATE = "Trade Circular Date";//"回单日期"; +Zi.LAN.ISRECEIVE = "Change Or Not";//"是否还单"; +Zi.LAN.RETURN_MAN = "Change Document By";//"还单人"; +Zi.LAN.RETURN_DATE = "Change Document Date";//"还单日期"; +Zi.LAN.RETURN_TRANCER = "Change Document Express Company";//"还单的快递公司"; +Zi.LAN.RETURN_TRANCNO = "Change Document Express Number";//"还单的快递单号"; +Zi.LAN.CUSTOMDATE = "Declaration date";//"报关日期"; +Zi.LAN.CUSTOMERNAME = "Customer"; //"委托单位"; +Zi.LAN.CUSTFULLNAME = "Customer Full Name"; //"委托单位全称"; +Zi.LAN.CUSTNO = "CUSTNO";//"委托编号"; +Zi.LAN.CUSTOMNO = "Declaration No";//"报关单号"; +Zi.LAN.ENTERP = "Business Units";//"经营单位"; +Zi.LAN.MBLNO = "MBLNO";//"主提单号"; +Zi.LAN.HBLNO = "HBLNO";//"分提单号"; +Zi.LAN.ETD = "ETD";//"开船日期"; +Zi.LAN.VESSEL = "VESSEL"; //"船名"; +Zi.LAN.VOYNO = "VOY"; //"航次"; +Zi.LAN.SALE = "SALE";//"揽货人"; +Zi.LAN.DOC = "DOC";//"单证"; +Zi.LAN.OP = "OP";//"操作"; +Zi.LAN.CREATEUSER = "Created by";//"创建人"; +Zi.LAN.CREATETIME = "Created time";//"创建时间"; +Zi.LAN.MODIFIEDUSER = "Last alteration";//"最后更改人"; +Zi.LAN.MODIFIEDTIME = "Last alteration time";//"最后更改时间"; +Zi.LAN.CUSTSERVICE = "CUSTSERVICE";//"客服"; +Zi.LAN.FRCUSTSERVICE = "Overseas Customer Service";//"海外客服"; +Zi.LAN.CONTRACTNO = "SQ NO."; //"运费协议号"; +Zi.LAN.PORTLOAD = "POL"; //"起运港"; +Zi.LAN.PORTDISCHARGE = "POD"; //"卸货港"; +Zi.LAN.DESTINATION = "Destination"; //"目的地"; +Zi.LAN.ACCDATE = "ACC Period"; //"会计期间"; +Zi.LAN.CARRIER = "Carrier"; //"船公司"; +Zi.LAN.LANE = "LINE"; //"航线"; +Zi.LAN.BSSOURCE = "BSSOURCE";//"业务来源"; +Zi.LAN.YARD = "YARD";//"场站"; +Zi.LAN.FORWARDER = "BOOKING AGENT"; //"订舱代理"; +Zi.LAN.BsType = "Type Of Transportation";//"运输类型"; +Zi.LAN.TRANSTYPE = "Type Of Transportation";//"运输类型"; +Zi.LAN.LANE = "LINE"; //"航线"; +Zi.LAN.QueRenSongDan = "";//"确认送单"; +Zi.LAN.QuXiaoSongDan = "";//"取消送单"; +Zi.LAN.QueRenHuiDan = "";//"确认回单"; +Zi.LAN.QuXiaoHuiDan = "";//"取消回单"; +Zi.LAN.QueRenHuanDan = "";//"确认还单"; +Zi.LAN.QuXiaoHuanDan = "";//"取消还单"; +Zi.LAN.FANWEI = "Scope";//"范围"; +Zi.LAN.XUANZHONG = "Select";//"选中"; +Zi.LAN.QUANBU = "All";//"全部"; +Zi.LAN.SHANGCHUANFUJIAN = "Upload attachment";//"上传附件"; +Zi.LAN.WENJIANMINGCHENG = "Name";//"文件名"; +Zi.LAN.FUJIANLEIXING = "Type";//"附件类型"; +Zi.LAN.SHANGCHUANREN = "Uploader";//"上传人"; +Zi.LAN.SHANGCHUANSHIJIAN = "Upload time";// "上传时间"; +Zi.LAN.SUIFUDANZHENGDAIM = "";// "随附单证代码"; +Zi.LAN.SUIFUDANZHENGBIANHAO = "";//"随附单证编号"; +Zi.LAN.ISPUBLIC = "";//"是否公开"; +Zi.LAN.GONGKAI = "";//"公开"; +Zi.LAN.BUGONGKAI = "";//"不公开"; +Zi.LAN.SHI = "YES";//"是"; +Zi.LAN.MEIYOUQUANXIAN = "You do not have permission to modify this information!";//"你没有权限修改此信息!"; +Zi.LAN.QueDingYaoCaoZuoXuanZhongDeShuJuMa = "Are you sure you want to manipulate the selected data?";//"确定要操作选中的数据吗？"; +Zi.LAN.CaoZuoChengGong = "operate successfully";// "操作成功！"; +Zi.LAN.QingXuanZeWeiJian = "Please select file";//"请选择文件"; +Zi.LAN.ShangChuan = "Upload";// "上传"; +Zi.LAN.WenJiAN = "File";//"文件"; +Zi.LAN.QingXuanZeYaoDaYinDeShuJu = "Please select the data to print first!";// "请先选择要打印的数据!"; +Zi.LAN.DengLuXinXiBuQuan = "The login information is incomplete. Please exit and log in again";//"登录信息不全，请退出重新登录"; +Zi.LAN.DeleteSuccess = "Successfully deleted";//"删除成功"; +Zi.LAN.DeleteErro = "Delete Error!";//"删除错误"; //Zi.LAN. = ""; diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeIndex.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeIndex.js index 1e9162c3..e1d16692 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeIndex.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeIndex.js @@ -2798,7 +2798,7 @@ Ext.extend(Shipping.MsOpSeaeIndex, Ext.Panel, { text: Zi.LAN.SaveSEAI, //"生成海运进口业务", handler: function (menu, event) { _this.subordertype = "SEAI"; - _this.formSubCompOrder.getForm().findField('FeeType').setVisible(false); +// _this.formSubCompOrder.getForm().findField('FeeType').setVisible(false); _this.winSubCompOrder.show(); } }, @@ -2811,7 +2811,7 @@ Ext.extend(Shipping.MsOpSeaeIndex, Ext.Panel, { text: Zi.LAN.winSubCompOrder, //"生成海运进口业务", handler: function (menu, event) { _this.subordertype = "SEAE"; - _this.formSubCompOrder.getForm().findField('FeeType').setVisible(true); +// _this.formSubCompOrder.getForm().findField('FeeType').setVisible(true); _this.winSubCompOrder.show(); } }, { diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeSaleEdit.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeSaleEdit.js index dfb5d99d..d45cd515 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeSaleEdit.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeSaleEdit.js @@ -1602,19 +1602,19 @@ Ext.extend(Shipping.MsOpSeaeSaleEdit, Ext.Panel, { defaultType: 'textfield', layout: 'hbox', items: [{ - fieldLabel: '装港代码', + fieldLabel: Zi.LAN.PORTLOADID, name: 'PORTLOADID' }, { - fieldLabel: '卸港代码', + fieldLabel: Zi.LAN.PORTDISCHARGEID , name: 'PORTDISCHARGEID' }, { - fieldLabel: '目的代码', + fieldLabel: Zi.LAN.DESTINATIONID , name: 'DESTINATIONID' }, { - fieldLabel: '交货代码', + fieldLabel: Zi.LAN.PLACEDELIVERYID, name: 'PLACEDELIVERYID' }, { - fieldLabel: '收货代码', + fieldLabel: Zi.LAN.PLACERECEIPTID, name: 'PLACERECEIPTID' }] }, { @@ -2601,7 +2601,7 @@ Ext.extend(Shipping.MsOpSeaeSaleEdit, Ext.Panel, { this.panelpage = new Ext.Panel({ - title: '委托详细信息', + title: Zi.LAN.panelpage, layout: "border", region: 'center', animate: true, @@ -2612,7 +2612,7 @@ Ext.extend(Shipping.MsOpSeaeSaleEdit, Ext.Panel, { }); this.panelEDIpage = new Ext.Panel({ - title: 'EDI及其他信息', + title: Zi.LAN.panelEDIpage, layout: "border", region: 'center', animate: true, @@ -2637,7 +2637,7 @@ Ext.extend(Shipping.MsOpSeaeSaleEdit, Ext.Panel, { }); this.panelSeae = new Ext.Panel({ - title: '委托信息', + title: Zi.LAN.panelSeae, id: 'pnlmodNewOpSeaeInfo', layout: "border", region: 'center', @@ -2824,7 +2824,7 @@ Ext.extend(Shipping.MsOpSeaeSaleEdit, Ext.Panel, { frame: false, salefee:'1', closable: true, - title: '费用信息' + title: Zi.LAN.FeeEdit }); this.tabSeaepanel.add(paneltabfee); @@ -2837,7 +2837,7 @@ Ext.extend(Shipping.MsOpSeaeSaleEdit, Ext.Panel, { autoScroll: true, frame: false, closable: true, - title: '单据管理' + title: Zi.LAN.DocEdit }); this.tabSeaepanel.add(panelReceiptEditGrid); @@ -2849,7 +2849,7 @@ Ext.extend(Shipping.MsOpSeaeSaleEdit, Ext.Panel, { autoScroll: true, frame: false, closable: true, - title: '更改单信息', + title: Zi.LAN.AMEND, html: ' ' }); diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsRptChInvTotal/MsRptChInvTotalIndex.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsRptChInvTotal/MsRptChInvTotalIndex.js index e364fc4f..cde1ae8b 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsRptChInvTotal/MsRptChInvTotalIndex.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsRptChInvTotal/MsRptChInvTotalIndex.js @@ -466,9 +466,9 @@ Ext.extend(Shipping.MsRptChInvTotalIndex, Ext.Panel, { //header: '发票类别', width: 120, renderer: function (value, meta, record) { - if (value == '自由开票') { + if (value == '自由发票') { value = Zi.LAN.FREEINVOICE; - } else if (value == '申请开票') { + } else if (value == '申请发票') { value = Zi.LAN.SHENINVOICE; } return value; diff --git a/DSWeb/DSWeb.csproj.user b/DSWeb/DSWeb.csproj.user index a8615099..5d714467 100644 --- a/DSWeb/DSWeb.csproj.user +++ b/DSWeb/DSWeb.csproj.user @@ -4,7 +4,7 @@ ShowAllFiles 配置文件1 true - Debug|Any CPU + Release|Any CPU diff --git a/DispatchWeb/DispatchWeb.csproj.user b/DispatchWeb/DispatchWeb.csproj.user index e6a8406a..af17a67a 100644 --- a/DispatchWeb/DispatchWeb.csproj.user +++ b/DispatchWeb/DispatchWeb.csproj.user @@ -1,7 +1,7 @@  - Debug|Any CPU + Release|Any CPU true