diff --git a/DSWeb/Areas/Account/Controllers/Chfee_settlementController.cs b/DSWeb/Areas/Account/Controllers/Chfee_settlementController.cs index e7f31dbc..5dd0e7f3 100644 --- a/DSWeb/Areas/Account/Controllers/Chfee_settlementController.cs +++ b/DSWeb/Areas/Account/Controllers/Chfee_settlementController.cs @@ -146,9 +146,10 @@ namespace DSWeb.Areas.Account.Controllers { ChSettlement head = null; int total = 0; + string LAN = Convert.ToString(Session["LANGUAGES"]); if (handle == "edit") { - var list = ChsettlementDAL.GetDataList(condition,0,10,out total, CookieConfig.GetCookie_UserId(Request), CookieConfig.GetCookie_UserCode(Request), Convert.ToString(Session["COMPANYID"])); + var list = ChsettlementDAL.GetDataList(condition,0,10,out total, CookieConfig.GetCookie_UserId(Request), CookieConfig.GetCookie_UserCode(Request), Convert.ToString(Session["COMPANYID"]),null,0,"0",LAN); if (list.Count > 0) head = list[0]; } @@ -786,7 +787,9 @@ namespace DSWeb.Areas.Account.Controllers public ContentResult GetPaydetailList(string billno) { - var dataList = ChsettlementDAL.GetPayDetailList(billno); + + string LAN = Convert.ToString(Session["LANGUAGES"]); + var dataList = ChsettlementDAL.GetPayDetailList(billno, LAN); var json = JsonConvert.Serialize(new { Success = true, Message = "查询成功", totalCount = dataList.Count, data = dataList.ToList() }); @@ -795,7 +798,8 @@ namespace DSWeb.Areas.Account.Controllers public ContentResult GetAppBodyList(string condition, string sort) { - var dataList = ChsettlementDAL.GetAppBodyList(condition,sort); + string LAN = Convert.ToString(Session["LANGUAGES"]); + var dataList = ChsettlementDAL.GetAppBodyList(condition,sort, LAN); var json = JsonConvert.Serialize(new { Success = true, Message = "查询成功", totalCount = dataList.Count, data = dataList.ToList() }); diff --git a/DSWeb/Areas/Account/DAL/Chfee_settlement/Chfee_SettlementDAL.cs b/DSWeb/Areas/Account/DAL/Chfee_settlement/Chfee_SettlementDAL.cs index db48a8f9..387c35bd 100644 --- a/DSWeb/Areas/Account/DAL/Chfee_settlement/Chfee_SettlementDAL.cs +++ b/DSWeb/Areas/Account/DAL/Chfee_settlement/Chfee_SettlementDAL.cs @@ -2190,7 +2190,7 @@ namespace DSWeb.Areas.Account.DAL.Chfee_Settlement } - static public List GetPayDetailList(string billno) + static public List GetPayDetailList(string billno,string lan="") { var strSql = new StringBuilder(); @@ -2200,7 +2200,10 @@ namespace DSWeb.Areas.Account.DAL.Chfee_Settlement strSql.Append(" ,cm.REMARK,cm.COMPANYID "); strSql.Append(",f.AMOUNT as DOAMOUNT "); strSql.Append(",f.PAYDOAMOUNT as PAYDOAMOUNT "); - strSql.Append(",(select EnumValueName from tSysEnumValue where LangId=0 and EnumTypeID=97005 and EnumValueID=cm.BILLSTATUS) as BILLSTATUSREF"); + if (lan=="en-us") + strSql.Append(",(select EnumValueName_2 from tSysEnumValue where LangId=0 and EnumTypeID=97005 and EnumValueID=cm.BILLSTATUS) as BILLSTATUSREF"); + else + strSql.Append(",(select EnumValueName from tSysEnumValue where LangId=0 and EnumTypeID=97005 and EnumValueID=cm.BILLSTATUS) as BILLSTATUSREF"); strSql.Append(",(select ShowName from [user] where GID=cm.APPLICANT) as APPLICANTNAME"); strSql.Append(" FROM v_fee_do_payapplication f left join ch_fee_payapplication cm on (cm.BILLNO=f.PAYBILLNO) where f.BILLNO='"+billno+"'"); @@ -2259,7 +2262,7 @@ namespace DSWeb.Areas.Account.DAL.Chfee_Settlement } - static public List GetAppBodyList(string strCondition, string sort = null) + static public List GetAppBodyList(string strCondition, string sort = null,string lan="") { var strSql = new StringBuilder(); strSql.Append(" SELECT c.GID,c.BSNO,c.FEEID,c.FEENAME,c.CURRENCY,c.AMOUNT,c.DOAMOUNT,c.ORIGCURRENCY,c.ORIGAMOUNT,ISNULL(c.ORIGSTLAMOUNT,0) AS ORIGSTLAMOUNT,c.EXCHANGERATE "); diff --git a/DSWeb/Areas/Account/Viewsjs/Chfee_settlement/ChPayAppBLsettlementEdit.js b/DSWeb/Areas/Account/Viewsjs/Chfee_settlement/ChPayAppBLsettlementEdit.js index 2dfac7db..8d57e4a3 100644 --- a/DSWeb/Areas/Account/Viewsjs/Chfee_settlement/ChPayAppBLsettlementEdit.js +++ b/DSWeb/Areas/Account/Viewsjs/Chfee_settlement/ChPayAppBLsettlementEdit.js @@ -902,7 +902,16 @@ Ext.extend(Shipping.MsChPayAppSettlementEdit, Ext.Panel, { sortable: true, dataIndex: 'FEETYPEREF', header: Zi.LAN.FeeTypeRef, - width: 40 + width: 40, + renderer: function (value, meta) { + if (value == '收') { + return Zi.LAN.YingShouFee; + } else if (value == '付') { + return Zi.LAN.YingFuFee; + } else { + return ""; + } + } }, { sortable: true, dataIndex: 'AMOUNT', diff --git a/DSWeb/Areas/Account/Viewsjs/Chfee_settlement/ChRecvsettlementBLEdit.js b/DSWeb/Areas/Account/Viewsjs/Chfee_settlement/ChRecvsettlementBLEdit.js index 26290aae..2de5aff1 100644 --- a/DSWeb/Areas/Account/Viewsjs/Chfee_settlement/ChRecvsettlementBLEdit.js +++ b/DSWeb/Areas/Account/Viewsjs/Chfee_settlement/ChRecvsettlementBLEdit.js @@ -691,7 +691,16 @@ Ext.extend(Shipping.MsChRecvSettlementBLEdit, Ext.Panel, { sortable: true, dataIndex: 'FEETYPEREF', header: Zi.LAN.FeeTypeRef, - width: 40 + width: 40, + renderer: function (value, meta) { + if (value == '收') { + return Zi.LAN.YingShouFee; + } else if (value == '付') { + return Zi.LAN.YingFuFee; + } else { + return ""; + } + } }, { sortable: true, dataIndex: 'FEEOBJNAME', @@ -940,7 +949,16 @@ Ext.extend(Shipping.MsChRecvSettlementBLEdit, Ext.Panel, { sortable: true, dataIndex: 'FEETYPEREF', header: Zi.LAN.FeeTypeRef, - width: 40 + width: 40, + renderer: function (value, meta) { + if (value == '收') { + return Zi.LAN.YingShouFee; + } else if (value == '付') { + return Zi.LAN.YingFuFee; + } else { + return ""; + } + } }, { sortable: true, dataIndex: 'CURRENCY', diff --git a/DSWeb/Areas/MvcShipping/DAL/MsCwVouchersGl/MsCwVouchersGlDAL.cs b/DSWeb/Areas/MvcShipping/DAL/MsCwVouchersGl/MsCwVouchersGlDAL.cs index c1046c0e..acc8cdca 100644 --- a/DSWeb/Areas/MvcShipping/DAL/MsCwVouchersGl/MsCwVouchersGlDAL.cs +++ b/DSWeb/Areas/MvcShipping/DAL/MsCwVouchersGl/MsCwVouchersGlDAL.cs @@ -3170,7 +3170,11 @@ namespace DSWeb.MvcShipping.DAL.MsCwVouchersGlDAL vouitems.currency_name = CURR; vouitems.summary = voudetail.EXPLAN; vouitems.curr_rate = voudetail.FCYEXRATE; - vouitems.amount = voudetail.FCYDR + voudetail.FCYCR; + if ((voudetail.FCYDR + voudetail.FCYCR)!=0) + vouitems.amount = voudetail.FCYDR + voudetail.FCYCR; + else + vouitems.amount = voudetail.AMTDR + voudetail.AMTCR; + vouitems.debit_local = voudetail.AMTDR; vouitems.credit_local = voudetail.AMTCR; Dictionary auxiliary = new Dictionary(); diff --git a/DSWeb/Areas/MvcShipping/DAL/MsFeeTemplate/MsFeeTemplateDAL.cs b/DSWeb/Areas/MvcShipping/DAL/MsFeeTemplate/MsFeeTemplateDAL.cs index 49594bee..fea3596b 100644 --- a/DSWeb/Areas/MvcShipping/DAL/MsFeeTemplate/MsFeeTemplateDAL.cs +++ b/DSWeb/Areas/MvcShipping/DAL/MsFeeTemplate/MsFeeTemplateDAL.cs @@ -357,7 +357,8 @@ namespace DSWeb.MvcShipping.DAL.MsFeeTemplate } else if (FeeTempDetail.Client == 7) { - + customername = enumbillValue.AGENTID; + custtype = "代理"; } else if (FeeTempDetail.Client == 8) { diff --git a/DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeEdiPortDAL.cs b/DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeEdiPortDAL.cs index c3470b9b..ec3b85c6 100644 --- a/DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeEdiPortDAL.cs +++ b/DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeEdiPortDAL.cs @@ -16204,7 +16204,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeEdiPortDAL var icount = 0; var bsno = ""; var OpBill = new MsOpSeaeBill(); - r.WriteLine("UNB+UNOA:1+" + ftpset.SENDCODE + ":ZZZ+" + ftpset.RECEIVECODE + ":ZZZ+" + DateTime.Now.ToString("yyMMdd:HHmm") + "+" + headData[0].CUSTNO + "'"); + r.WriteLine("UNB+UNOC:1+" + ftpset.SENDCODE + ":ZZZ+" + ftpset.RECEIVECODE + ":ZZZ+" + DateTime.Now.ToString("yyMMdd:HHmm") + "+" + headData[0].CUSTNO + "'"); icount++; foreach (var bill in headData) { @@ -16295,7 +16295,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeEdiPortDAL #endregion #region 各种单号、付款方式代码 - + if (!string.IsNullOrEmpty(bill.MBLNO)) r.WriteLine("RFF+BN:" + bill.MBLNO + "'"); //icount++; @@ -16330,26 +16330,23 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeEdiPortDAL #endregion - if (ftpset.SENDNAME.Length > 35) - r.WriteLine("NAD+BA+" + ftpset.SENDCOMPANYCODE + ":160:86++" + ftpset.SENDNAME.Substring(0, 35) + "+" + ftpset.SENDNAME.Substring(35) + "'"); - else - r.WriteLine("NAD+BA+" + ftpset.SENDCOMPANYCODE + ":160:86++" + ftpset.SENDNAME + "'"); + //if (ftpset.SENDNAME.Length > 35) + // r.WriteLine("NAD+ZZZ" + ftpset.SENDCOMPANYCODE + ":160:86++" + ftpset.SENDNAME.Substring(0, 35) + "+" + ftpset.SENDNAME.Substring(35) + "'"); + //else + r.WriteLine("NAD+ZZZ+" + ftpset.SENDCODE + ":160:86++" + ftpset.SENDCODE + "'"); icount++; - //r.WriteLine("CTA+IC+:" + billams.ATTN + "'"); - //r.WriteLine("COM+" + billams.ATTNTEL + ":TE'"); - //r.WriteLine("COM+" + billams.ATTNEMAIL + ":EM'"); - if (dsUserOp != null) - { - if (dsUserOp.Tables[0].Rows.Count > 0) - { + //if (dsUserOp != null) + //{ + // if (dsUserOp.Tables[0].Rows.Count > 0) + // { - r.WriteLine("CTA+IC+:" + dsUserOp.Tables[0].Rows[0]["USERNAME"].ToString().Trim() + "'"); - r.WriteLine("COM+" + dsUserOp.Tables[0].Rows[0]["OFFICEPHONE"].ToString().Trim() + ":TE'"); - r.WriteLine("COM+" + dsUserOp.Tables[0].Rows[0]["EMAIL1"].ToString().Trim() + ":EM'"); - icount = icount + 3; - } - } + // r.WriteLine("CTA+IC+:" + dsUserOp.Tables[0].Rows[0]["USERNAME"].ToString().Trim() + "'"); + // r.WriteLine("COM+" + dsUserOp.Tables[0].Rows[0]["OFFICEPHONE"].ToString().Trim() + ":TE'"); + // r.WriteLine("COM+" + dsUserOp.Tables[0].Rows[0]["EMAIL1"].ToString().Trim() + ":EM'"); + // icount = icount + 3; + // } + //} #region 发货人 @@ -16537,26 +16534,17 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeEdiPortDAL icount = icount + 3; } - if (ftpset.SENDNAME.Length > 35) - r.WriteLine("NAD+FW+" + ftpset.SENDCOMPANYCODE + ":160:86++" + ftpset.SENDNAME.Substring(0, 35) + "+" + ftpset.SENDNAME.Substring(35) + "'"); - else - r.WriteLine("NAD+FW+" + ftpset.SENDCOMPANYCODE + ":160:86++" + ftpset.SENDNAME + "'"); - icount++; - - if (ftpset.SENDNAME.Length > 35) - r.WriteLine("NAD+FC+" + ftpset.SENDCOMPANYCODE + ":160:86++" + ftpset.SENDNAME.Substring(0, 35) + "+" + ftpset.SENDNAME.Substring(35) + "'"); - else - r.WriteLine("NAD+FC+" + ftpset.SENDCOMPANYCODE + ":160:86++" + ftpset.SENDNAME + "'"); - icount++; #endregion - if (bill.BLFRT.IndexOf("PREPAID") >= 0) - r.WriteLine("CPI+4++P'"); - else - r.WriteLine("CPI+4++C'"); - icount++; + //if (bill.BLFRT.IndexOf("PREPAID") >= 0) + // r.WriteLine("CPI+4++P'"); + //else + // r.WriteLine("CPI+4++C'"); + //icount++; + r.WriteLine("NAD+CA+EGLV'"); + icount++; #region 总件数//订舱不需要分箱明细 if (isbill != 1) @@ -16578,6 +16566,8 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeEdiPortDAL else Shipping = formatEdiStr("txt", OpBill.DESCRIPTION); Shipping = Shipping.Replace("\n", "\\"); Shipping = Shipping.Replace("\r", " "); + var tmpdescription = ""; + List DescriptionListAll = new List(); string[] DescriptionList = Shipping.Split('\\'); if (DescriptionList.Length != 0) { @@ -16585,11 +16575,32 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeEdiPortDAL { if (DescriptionList[i] != "") { - r.WriteLine("FTX+AAA+++" + DescriptionList[i] + "'"); - icount++; + if ((tmpdescription.Length + DescriptionList[i].Length + 1) > 512) + { + DescriptionListAll.Add(tmpdescription); + tmpdescription = DescriptionList[i]; + } + else { + tmpdescription = tmpdescription + " " + DescriptionList[i]; + + } } } } + if (!string.IsNullOrEmpty(tmpdescription)) { + DescriptionListAll.Add(tmpdescription); + } + + if (DescriptionListAll.Count != 0) { + foreach (var description in DescriptionListAll) { + r.WriteLine("FTX+AAA+++" + description + "'"); + icount++; + + } + + } + + if (DescriptionShipper != "") { if (DescriptionShipper != "") @@ -16624,12 +16635,12 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeEdiPortDAL #region 重量、尺码 if (isbill != 1) { - r.WriteLine("MEA+AAE+G+KGM:" + Math.Round(Convert.ToDecimal(bill.KGS), 3) + "'"); + r.WriteLine("MEA+AAE+WT+KGM:" + Math.Round(Convert.ToDecimal(bill.KGS), 3) + "'"); r.WriteLine("MEA+AAE+AAW+MTQ:" + Math.Round(Convert.ToDecimal(bill.CBM), 3) + "'"); } else { - r.WriteLine("MEA+AAE+G+KGM:" + Math.Round(OpBill.KGS, 3) + "'"); + r.WriteLine("MEA+AAE+WT+KGM:" + Math.Round(OpBill.KGS, 3) + "'"); r.WriteLine("MEA+AAE+AAW+MTQ:" + Math.Round(OpBill.CBM, 3) + "'"); } icount = icount + 2; @@ -16679,7 +16690,10 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeEdiPortDAL else r.WriteLine("EQD+CN++" + GetCtnEDICode(ctn.CTNALL, "MAERSK") + "+2'"); r.WriteLine("EQN+" + ctn.CTNNUM.ToString() + "'"); - icount = icount + 2; + r.WriteLine("TMD+3'"); + r.WriteLine("MEA+AAE+WT+KGM:" + Math.Round(ctn.KGS, 3) + "'"); + r.WriteLine("MEA+AAE+AAW+MTQ:" + Math.Round(ctn.CBM, 3) + "'"); + icount = icount + 3; if (bill.CARGOID == "R") { @@ -16688,7 +16702,30 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeEdiPortDAL r.WriteLine("MEA+AAE+AAS+CBM:" + bill.REEFERF + "'"); icount++; } - r.WriteLine("TMP+2+" + bill.TEMPSET + ":CEL'"); + var tmp = bill.TEMPSET; + if (tmp != "") + { + var fuhao = ""; + if (tmp.IndexOf("-") == 0) + { + fuhao = "-"; + tmp = tmp.Replace("-", ""); + } + if (tmp.Length < 3) + { + for (int i = 0; i < 3 - tmp.Length + 1; i++) + { + tmp = "0" + tmp; + } + } + tmp = fuhao + tmp; + } + else + { + tmp = "000"; + } + + r.WriteLine("TMP+2+" + tmp + ":CEL'"); icount++; } } diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MainForm/MainForm.js b/DSWeb/Areas/MvcShipping/Viewsjs/MainForm/MainForm.js index f07cac17..6c6366b8 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MainForm/MainForm.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MainForm/MainForm.js @@ -622,7 +622,7 @@ Ext.extend(Shipping.MainForm, Ext.Panel, { this.topPart = new Ext.Panel({ - html: "东胜物流信息管理系统", + html: "" + Zi.LAN.DONGSHENGSFOT+"", region: 'north', layout: { type: 'hbox', @@ -691,7 +691,7 @@ Ext.extend(Shipping.MainForm, Ext.Panel, { // }, { xtype: 'label', - html: "用户名:" + SHOWNAME + "(" + COMPANYNAME + ")        ", + html: Zi.LAN.USERNAME + SHOWNAME + "(" + COMPANYNAME + ")        ", height: 40, padding: '5 5 3 10', style: 'color:#FFFFFF;', @@ -703,7 +703,7 @@ Ext.extend(Shipping.MainForm, Ext.Panel, { padding: '5 5 3 10', html: "我的消息(0/0)    ", + "\" style=\"color:#FFFFFF;text-decoration:none;\">" + Zi.LAN.WODEXIAOXI+"(0/0)    ", height: 40 }, { @@ -711,19 +711,19 @@ Ext.extend(Shipping.MainForm, Ext.Panel, { padding: '5 5 3 10', html: "    下载    ", + "\" style=\"color:#FFFFFF;text-decoration:none; \">" + Zi.LAN.XIAZAI +"    ", height: 40 }, { xtype: 'label', padding: '5 5 3 10', - html: "    关于    ", + html: "    " + Zi.LAN.GUANYU +"    ", height: 40 }, { xtype: 'label', padding: '5 5 3 10', - html: "[退出]", + html: "" + Zi.LAN.TUICHU+"", height: 40 } ] @@ -768,6 +768,8 @@ Ext.extend(Shipping.MainForm, Ext.Panel, { var messagestr = result.data; var dvMessage = Ext.getCmp('dvMessage'); // dvMessage.setText(messagestr); + + messagestr = messagestr.replace("我的消息", Zi.LAN.WODEXIAOXI); dvMessage.update( "" + diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsChDui/MsChDuiBLEdit.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsChDui/MsChDuiBLEdit.js index 86c21dce..b5ce3d74 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsChDui/MsChDuiBLEdit.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsChDui/MsChDuiBLEdit.js @@ -166,7 +166,20 @@ Ext.extend(Shipping.MsChDuiEdit, Ext.Panel, { displayField: 'NAME' }); - + this.StoreBSSTATUSREF = Ext.create('Ext.data.Store', { + fields: ['STLNAME', 'DISPLAYNAME'] + }); + this.StoreBSSTATUSREF.add({ "STLNAME": "锁定", "DISPLAYNAME": Zi.LAN.SubmitAudit}); + this.StoreBSSTATUSREF.add({ "STLNAME": "未锁定", "DISPLAYNAME": Zi.LAN.NotSubmitAudit }); + this.comboxBILLSTATUSREF = Ext.create('DsExt.ux.RefTableCombox', { + store: this.StoreBSSTATUSREF, + fieldLabel: Zi.LAN.BSSTATUSREF, //'结算方式', + forceSelection: true, readOnly: true, + //flex: 0.5, + name: 'BILLSTATUSREF', + valueField: 'STLNAME', + displayField: 'DISPLAYNAME' + }); //编辑form this.formEdit = Ext.widget('form', { @@ -213,11 +226,7 @@ Ext.extend(Shipping.MsChDuiEdit, Ext.Panel, { fieldLabel: Zi.LAN.duizdate, //对账日期 readOnly: true, name: 'DUIDATE' - }, { - fieldLabel: Zi.LAN.status, //状态 - readOnly: true, - name: 'BILLSTATUSREF' - }, this.comboxNOTAX + }, this.comboxBILLSTATUSREF, this.comboxNOTAX ] }, { xtype: 'container', @@ -914,7 +923,16 @@ Ext.extend(Shipping.MsChDuiEdit, Ext.Panel, { sortable: true, dataIndex: 'FeeType_Ref', header: Zi.LAN.PayReceive, //收付 - width: 40 + width: 40, + renderer: function (value, meta) { + if (value == '应收') { + return Zi.LAN.DR; + } else if (value == '应付') { + return Zi.LAN.CR; + } else { + return ""; + } + } }, { sortable: true, dataIndex: 'FeeName', diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpLetter/MsOpLetterSurEdit.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpLetter/MsOpLetterSurEdit.js index 6b231b02..787b51fb 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpLetter/MsOpLetterSurEdit.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpLetter/MsOpLetterSurEdit.js @@ -133,7 +133,7 @@ Ext.extend(Shipping.MsOpLetterSurEdit, Ext.Panel, { }, items: [{ xtype: 'label', - html: '致：
对下述货物' + html: '' + Zi.LAN.zhi + '
' + Zi.LAN.Duixiashuhuowu+'' },{ xtype: 'container', layout: 'hbox', @@ -165,7 +165,7 @@ Ext.extend(Shipping.MsOpLetterSurEdit, Ext.Panel, { }] }, { xtype: 'label', - html: '我司申请贵司给予办理电报放货事项，收货人如下：' + html: '' + Zi.LAN.wosibanlidianfang+'' }, { xtype: 'textareafield', grow: true, @@ -175,7 +175,7 @@ Ext.extend(Shipping.MsOpLetterSurEdit, Ext.Panel, { anchor: '100%' }, { xtype: 'label', - html: '担保条款（详见报表）
备注' + html: '' + Zi.LAN.danbaotiaokuan + '
' + Zi.LAN.REMARK+'' }, { xtype: 'textareafield', grow: true, diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpLetter/Zi_en-us.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpLetter/Zi_en-us.js index 8e5001fb..f2782527 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpLetter/Zi_en-us.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpLetter/Zi_en-us.js @@ -151,6 +151,10 @@ Zi.LAN.FuWuQiXiangYingChuCuo = "服务器响应出错,请重试"; Zi.LAN.QingXuanZeYeWu = "请先选择业务!"; Zi.LAN.ZhengZaiCaoZuoShuJu = "正在操作数据, 请稍侯..."; Zi.LAN.ZhengZaiChaXunShuJu = "正在查询数据..."; +Zi.LAN.zhi = "致："; +Zi.LAN.Duixiashuhuowu = "对下述货物"; +Zi.LAN.wosibanlidianfang = "我司申请贵司给予办理电报放货事项，收货人如下："; +Zi.LAN.danbaotiaokuan = "担保条款（详见报表）"; //#endregion //Zi.LAN. = ""; diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpLetter/Zi_zh-cn.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpLetter/Zi_zh-cn.js index a7d69ae4..3cada175 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpLetter/Zi_zh-cn.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpLetter/Zi_zh-cn.js @@ -150,7 +150,11 @@ Zi.LAN.GENGGAITONGZHI = "更改通知"; Zi.LAN.FuWuQiXiangYingChuCuo = "服务器响应出错,请重试"; Zi.LAN.QingXuanZeYeWu = "请先选择业务!"; Zi.LAN.ZhengZaiCaoZuoShuJu = "正在操作数据, 请稍侯..."; -Zi.LAN.ZhengZaiChaXunShuJu = "正在查询数据..."; +Zi.LAN.zhi = "致："; +Zi.LAN.Duixiashuhuowu = "对下述货物"; +Zi.LAN.wosibanlidianfang = "我司申请贵司给予办理电报放货事项，收货人如下："; +Zi.LAN.danbaotiaokuan = "担保条款（详见报表）"; + //#endregion //Zi.LAN. = ""; diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeEdit.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeEdit.js index 66a1a982..eba2c9c0 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeEdit.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeEdit.js @@ -1250,6 +1250,30 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { displayField: 'NAME' }); + this.StoreBSSTATUSREF= Ext.create('Ext.data.Store', { + fields: ['STLNAME', 'DISPLAYNAME'] + }); + this.StoreBSSTATUSREF.add({ "STLNAME": "锁定", "DISPLAYNAME": Zi.LAN.LOCK}); + this.StoreBSSTATUSREF.add({ "STLNAME": "未锁定", "DISPLAYNAME": Zi.LAN.UNLOCK }); + this.comboxBSSTATUSREF = Ext.create('DsExt.ux.RefTableCombox', { + store: this.StoreBSSTATUSREF, + fieldLabel: Zi.LAN.BSSTATUSREF, //'结算方式', + forceSelection: true, readOnly: true, + //flex: 0.5, + name: 'BSSTATUSREF', + valueField: 'STLNAME', + displayField: 'DISPLAYNAME' + }); + this.comboxFEESTATUSREF = Ext.create('DsExt.ux.RefTableCombox', { + store: this.StoreBSSTATUSREF, + fieldLabel: Zi.LAN.FEESTATUSREF, //'结算方式', + forceSelection: true, readOnly: true, + //flex: 0.5, + name: 'FEESTATUSREF', + valueField: 'STLNAME', + displayField: 'DISPLAYNAME' + }); + //#endregion //#region 编辑formHead 基本信息 @@ -1337,23 +1361,23 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { // fieldLabel: Zi.LAN.SALEDEPT, //'SALEDEPT', // name: 'SALEDEPT', hidden: true //} + , + + //{ + //fieldLabel: Zi.LAN.BSSTATUSREF, //'业务锁定', + //disabled: true, + //readOnly: true, + //name: 'BSSTATUSREF' + //} + + this.comboxBSSTATUSREF , { - fieldLabel: Zi.LAN.BSSTATUSREF, //'业务锁定', - disabled: true, - readOnly: true, - name: 'BSSTATUSREF' - }, { fieldLabel: 'ISCANCEL', //'业务锁定', disabled: true, hidden: true, readOnly: true, name: 'ISCANCEL' - }, { - fieldLabel: Zi.LAN.FEESTATUSREF, //'费用锁定', - readOnly: true, - disabled: true, - name: 'FEESTATUSREF' - }, { + }, this.comboxFEESTATUSREF, { fieldLabel: Zi.LAN.ACCDATE, //'会计期间', xtype: 'monthfield', name: 'ACCDATE' diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/Zi_en-us.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/Zi_en-us.js index 8a614549..7d7531c9 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/Zi_en-us.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/Zi_en-us.js @@ -792,4 +792,6 @@ Zi.LAN.CESHIOCR = "测试OCR"; Zi.LAN.YINRUZHONGYUANBC = "引入中远BC"; Zi.LAN.YINRUTJZHONGYUANBC = "引入天津中远BC"; Zi.LAN.YINRUEVERGREENBC = "引入长荣BC"; -Zi.LAN.YINRUMSKBC = "引入马士基BC"; \ No newline at end of file +Zi.LAN.YINRUMSKBC = "引入马士基BC"; +Zi.LAN.LOCK = "锁定"; +Zi.LAN.UNLOCK = "未锁定"; \ No newline at end of file diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/Zi_zh-cn.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/Zi_zh-cn.js index fc01080c..cb46509c 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/Zi_zh-cn.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/Zi_zh-cn.js @@ -821,7 +821,8 @@ Zi.LAN.YINRUZHONGYUANBC = "引入中远BC"; Zi.LAN.YINRUTJZHONGYUANBC = "引入天津中远BC"; Zi.LAN.YINRUEVERGREENBC = "引入长荣BC"; Zi.LAN.YINRUMSKBC = "引入马士基BC"; - +Zi.LAN.LOCK = "锁定"; +Zi.LAN.UNLOCK = "未锁定"; //Zi.LAN. = ""; diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeai/MsOpSeaiEdit.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeai/MsOpSeaiEdit.js index a6f0abdd..99165020 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeai/MsOpSeaiEdit.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeai/MsOpSeaiEdit.js @@ -644,38 +644,8 @@ Ext.extend(Shipping.MsOpSeaiEdit, Ext.Panel, { displayField: 'SourceDetail' }); - //状态_业务状态 - Ext.define('BSSTATUSModel', { - extend: 'Ext.data.Model', - fields: [ - { name: 'Name', type: 'string' } - ] - }); - var dataBSSTATUS = [{ "Name": "未锁定" }, { "Name": "锁定" }, { "Name": ""}]; - var storeBSSTATUS = Ext.create('Ext.data.Store', { - model: 'BSSTATUSModel', - data: dataBSSTATUS - }); - //业务状态 - this.comboxBSSTATUS = Ext.create('DsExt.ux.RefTableCombox', { - fieldLabel: Zi.LAN.BSSTATUS, //'业务状态', - forceSelection: true, - store: storeBSSTATUS, - id: 'BSSTATUS', - name: 'BSSTATUS', - valueField: 'Name', - displayField: 'Name' - }); - //费用状态 - this.comboxFEESTATUS = Ext.create('DsExt.ux.RefTableCombox', { - fieldLabel: Zi.LAN.FEESTATUS, //'费用状态', - forceSelection: true, - store: storeBSSTATUS, - id: 'FEESTATUS', - name: 'FEESTATUS', - valueField: 'Name', - displayField: 'Name' - }); + + //所属部门 this.storeDept = Ext.create('DsExt.ux.RefTableStore', { @@ -1015,6 +985,31 @@ Ext.extend(Shipping.MsOpSeaiEdit, Ext.Panel, { displayField: 'DISPLAYNAME' }); + this.StoreBSSTATUSREF = Ext.create('Ext.data.Store', { + fields: ['STLNAME', 'DISPLAYNAME'] + }); + this.StoreBSSTATUSREF.add({ "STLNAME": "锁定", "DISPLAYNAME": Zi.LAN.LOCK }); + this.StoreBSSTATUSREF.add({ "STLNAME": "未锁定", "DISPLAYNAME": Zi.LAN.UNLOCK }); + this.comboxBSSTATUSREF = Ext.create('DsExt.ux.RefTableCombox', { + store: this.StoreBSSTATUSREF, + fieldLabel: Zi.LAN.BSSTATUSREF, //'结算方式', + forceSelection: true, readOnly: true, + //flex: 0.5, + name: 'BSSTATUSREF', + valueField: 'STLNAME', + displayField: 'DISPLAYNAME' + }); + this.comboxFEESTATUSREF = Ext.create('DsExt.ux.RefTableCombox', { + store: this.StoreBSSTATUSREF, + fieldLabel: Zi.LAN.FEESTATUSREF, //'结算方式', + forceSelection: true, readOnly: true, + //flex: 0.5, + name: 'FEESTATUSREF', + valueField: 'STLNAME', + displayField: 'DISPLAYNAME' + }); + + //#region 编辑formHead 基本信息 this.formHead = Ext.widget('form', { region: 'north', @@ -1076,15 +1071,7 @@ Ext.extend(Shipping.MsOpSeaiEdit, Ext.Panel, { }, { fieldLabel: Zi.LAN.MBLFRT, //'MBLFRT', name: 'MBLFRT', hidden: true - }, { - fieldLabel: Zi.LAN.BSSTATUSREF, //'业务锁定', - readOnly: true, - name: 'BSSTATUSREF' - }, { - fieldLabel: Zi.LAN.FEESTATUSREF, //'费用锁定', - readOnly: true, - name: 'FEESTATUSREF' - }, { + }, this.comboxBSSTATUSREF, this.comboxFEESTATUSREF, { fieldLabel: Zi.LAN.ACCDATE, //'会计期间', xtype: 'monthfield', editable: false, diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeai/MsOpSeaiIndex.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeai/MsOpSeaiIndex.js index d875582e..c6e51730 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeai/MsOpSeaiIndex.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeai/MsOpSeaiIndex.js @@ -172,7 +172,7 @@ Ext.extend(Shipping.MsOpSeaiIndex, Ext.Panel, { sortable: true, id: '', dataIndex: 'BillFeeStatus', - header: '整票状态', //'整票状态', + header: Zi.LAN.BillFeeStatus, //'整票状态', width: 60, renderer: function (value, meta) { if (value == '0') { @@ -2088,7 +2088,8 @@ Ext.extend(Shipping.MsOpSeaiIndex, Ext.Panel, { handler: function (menu, event) { _this.onPiLiangSubmitClick(menu, event, 1); } - }, { text: "放单通知", //"放单通知", + }, { + text: Zi.LAN.FanDanTongZhi, //"放单通知", handler: function (menu, event) { _this.onFDTZClick(menu, event); } diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeai/Zi_en-us.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeai/Zi_en-us.js index 60bcf788..7949123c 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeai/Zi_en-us.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeai/Zi_en-us.js @@ -369,6 +369,8 @@ Zi.LAN.ZongZhong = "总重"; Zi.LAN.BtnQYHSZSEND = "发送至仓储"; Zi.LAN.YINRUBAOGUAN = "引入报关信息"; Zi.LAN.QueDingShanChuGaiJiLuMa = "确定删除该记录吗？"; +Zi.LAN.LOCK = "锁定"; +Zi.LAN.UNLOCK = "未锁定"; //#endregion //Zi.LAN. = ""; diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeai/Zi_zh-cn.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeai/Zi_zh-cn.js index 77b97a34..6ed4d55c 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeai/Zi_zh-cn.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeai/Zi_zh-cn.js @@ -415,6 +415,8 @@ Zi.LAN.ZongZhong = "总重"; Zi.LAN.BtnQYHSZSEND = "发送至仓储"; Zi.LAN.YINRUBAOGUAN = "引入报关信息"; Zi.LAN.QueDingShanChuGaiJiLuMa = "确定删除该记录吗？"; +Zi.LAN.LOCK = "锁定"; +Zi.LAN.UNLOCK = "未锁定"; //#endregion //Zi.LAN. = ""; diff --git a/DSWeb/Areas/SysMng/ViewJs/USERINFO/USERINFOEdit.js b/DSWeb/Areas/SysMng/ViewJs/USERINFO/USERINFOEdit.js index 589ced43..1a66f354 100644 --- a/DSWeb/Areas/SysMng/ViewJs/USERINFO/USERINFOEdit.js +++ b/DSWeb/Areas/SysMng/ViewJs/USERINFO/USERINFOEdit.js @@ -82,7 +82,7 @@ Ext.extend(DsTruck.USERINFOEdit, Ext.Panel, { layout: 'hbox', defaultType: 'textfield', items: [{ - fieldLabel: Zi.LAN.OLDPASSWORD = "旧密码";, + fieldLabel: Zi.LAN.OLDPASSWORD, name: 'OLDPASSWORD', flex: 1 , inputType: 'password' }//, { xtype: 'hiddenfield', flex: 3 } diff --git a/DSWeb/DSWeb.csproj b/DSWeb/DSWeb.csproj index be9caa3f..3e90d65f 100644 --- a/DSWeb/DSWeb.csproj +++ b/DSWeb/DSWeb.csproj @@ -1586,6 +1586,111 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -5029,6 +5134,7 @@ + diff --git a/DSWeb/Default.aspx b/DSWeb/Default.aspx index eddb1107..a410fd5f 100644 --- a/DSWeb/Default.aspx +++ b/DSWeb/Default.aspx @@ -52,7 +52,15 @@ } getSessgion4() - + function getSessgion6() { + strLANGUAGES = '<%= Session["LANGUAGES"] %>'; //zh-cn-中文，en-us－英文 + if (strLANGUAGES == "en-us") { + document.write('