1

DSWeb/Areas/Account/Viewsjs/Chfee_payapplication/ChPayapplicationAudit.js

@@ -1702,7 +1702,6 @@ Ext.extend(Shipping.ChPayapplicationAudit, Ext.Panel, {
             _this.billno = record.data.BILLNO;
             var sql = "";
             sql = " BILLNO='" + _this.billno + "'";
-            BodyPagenum
             _this.BodyPageSize = _this.BodyPagenum.getValue();
             _this.storeBodyListdetail.pageSize = _this.BodyPageSize;
             _this.storeBodyListdetail.load({ params: { start: 0, limit: _this.BodyPageSize, condition: sql} });

DSWeb/Areas/Account/Viewsjs/Chfee_payapplication/ChPayapplicationBLEdit.js

@@ -877,7 +877,7 @@ Ext.extend(Shipping.MsChPayapplicationBLEdit, Ext.Panel, {
             store: this.storeFeeNameRef,
             forceSelection: true,
             queryMode: 'remote',
-            fieldLabel: "费用名称",
+            fieldLabel: Zi.LAN.CostName ,
             labelWidth: 60,
             minChars: 1,
             queryParam: 'Name',

DSWeb/Areas/Account/Viewsjs/Chfee_payapplication/ChPayapplicationIndex.js

@@ -80,15 +80,20 @@ Ext.extend(Shipping.MsChPayapplicationIndex, Ext.Panel, {
                     value = record.data.BILLSTATUSREF;
                     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.BUFENJIESUAN;
                     } else if (value == '已结算') {
                         meta.tdCls = 'feestatus_settle';
+                        value = Zi.LAN.JIESUANWANBI;
                     }
-                   return record.data.BILLSTATUSREF;
+                    return value;
                 }
         }, {
             sortable: true,
@@ -99,7 +104,7 @@ Ext.extend(Shipping.MsChPayapplicationIndex, Ext.Panel, {
         },{
             sortable: true,
             dataIndex: 'SETTLETYPEREF',
-            header: '结算方式', //结算单位
+                header: Zi.LAN.jstype, //结算单位
             width: 120
                 
             },{
@@ -495,7 +500,7 @@ Ext.extend(Shipping.MsChPayapplicationIndex, Ext.Panel, {
               renderer: function (value, meta) {
 
                   if (value == '1')
-                      return '是'; //是
+                      return Zi.LAN.YES; //是
                   else
                       return '';
               }
@@ -527,11 +532,11 @@ Ext.extend(Shipping.MsChPayapplicationIndex, Ext.Panel, {
             }, {
                 sortable: true,
               dataIndex: 'ISREVINV',
-              header: '收到发票',
+              header: Zi.LAN.ISREVINV,
                 width: 80,
                 renderer: function (value, cellmeta) {
                     if (value == 'true') {
-                        return "是";
+                        return Zi.LAN.YES;
                     }
                 }
             }
@@ -916,17 +921,17 @@ Ext.extend(Shipping.MsChPayapplicationIndex, Ext.Panel, {
                     },
                     scope: this
                 }, '-', {
-                    text: '标识收到发票',
+                    text: Zi.LAN.BIAOSHIINV,
                     menu:
                         [
                             {
-                                text: "标识收到发票",
+                                text: Zi.LAN.BIAOSHIINV,
                                 id: "btnPayAppAccBal",
                                 handler: function (menu, event) {
                                     _this.UpdateApp(menu, event, 1);
                                 }
                             }, {
-                                text: "取消标识收到发票",
+                                text: Zi.LAN.QUXIAOBIAOSHIINV,
                                 id: "btnPayAppAccBalBack",
                                 handler: function (menu, event) {
                                     _this.UpdateApp(menu, event, 0);

DSWeb/Areas/Account/Viewsjs/Chfee_payapplication/Zi_zh-cn.js

@@ -308,3 +308,12 @@ Zi.LAN.TTLPROFIT = "合计利润";
 Zi.LAN.PROFITRATE = "利润率";
 Zi.LAN.INVOICEAMOUNT = "发票金额";
 Zi.LAN.FORWARDER = "订舱代理";
+Zi.LAN.SHENHETONGGUO = "审核通过";
+Zi.LAN.LURUZHUAGNTAI = "录入状态";
+Zi.LAN.TIJIAOSHENHE = "已提交";
+Zi.LAN.BUFENJIESUAN = "部分结算";
+Zi.LAN.JIESUANWANBI = "结算完毕";
+Zi.LAN.YES = "是";
+Zi.LAN.ISREVINV = "收到发票";
+Zi.LAN.BIAOSHIINV = "标识收到发票";
+Zi.LAN.QUXIAOBIAOSHIINV = "取消标识收到发票";

DSWeb/Areas/MvcShipping/Controllers/MsChFeeController.cs

@@ -1133,7 +1133,7 @@ namespace DSWeb.MvcShipping.Controllers
             }
             else
                 condition = " (FeeCode like '%" + Name + "%' or Name like '%" + Name + "%' or DESCRIPTION like '%"+ Name + "%') ";
-            List<FeeTypeRefModel> evList = MsChFeeDAL.GetFeeTypeRefList(condition);
+            List<FeeTypeRefModel> evList = MsChFeeDAL.GetFeeTypeRefList(condition, LAN);
 
             if (evList.Count == 0)
             {