1

8 months ago · 3a7cb14918
parent 149bfdf5af
commit 3a7cb14918
5 changed files with 10 additions and 2 deletions
--- a/DSWeb/Areas/MvcShipping/Viewsjs/MsChFee/FeeAmendDrCrGrid.js
+++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsChFee/FeeAmendDrCrGrid.js
@ -2308,6 +2308,9 @@ Ext.extend(Shipping.FeeAmendEditGrid, Ext.Panel, {
                if (value == '合计') {
                    return Zi.LAN.FEE.CustSum;
                } else {
+                    value = value.replace('更改单', 'Amend');
+                    value = value.replace('普通货', 'General');
+
                    return value;
                }

--- a/DSWeb/Areas/MvcShipping/Viewsjs/MsChFee/FeeDrCrGrid.js
+++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsChFee/FeeDrCrGrid.js
@ -3053,6 +3053,9 @@ Ext.extend(Shipping.FeeEditGrid, Ext.Panel, {
                if (value == '合计') {
                    return Zi.LAN.FEE.CustSum;
                } else {
+                    value = value.replace('更改单','Amend');
+                    value = value.replace('普通货', 'General');
+
                    return value;
                }
                
--- a/DSWeb/Areas/MvcShipping/Viewsjs/MsChFee/FeeDrCrGridView.js
+++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsChFee/FeeDrCrGridView.js
@ -1461,6 +1461,8 @@ Ext.extend(Shipping.FeeViewGrid, Ext.Panel, {
                if (value == '合计') {
                    return Zi.LAN.FEE.CustSum;
                } else {
+                    value = value.replace('更改单', 'Amend');
+                    value = value.replace('普通货', 'General');
                    return value;
                }

--- a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeIndex.js
+++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeIndex.js
@ -8372,7 +8372,7 @@ Ext.extend(Shipping.MsOpSeaeIndex, Ext.Panel, {

                    _this.suborderop = CnameString;
                    _this.subordercustservice = _this.comboxSeaeCustService.getValue();
-                    _this.suborderfeetype = form.findField('FeeType').getValue();
+                    //_this.suborderfeetype = form.findField('FeeType').getValue();


                    _this.onSubCompOrderClick();
--- a/DSWeb/DSWeb.csproj.user
+++ b/DSWeb/DSWeb.csproj.user
@ -4,7 +4,7 @@
    <ProjectView>ShowAllFiles</ProjectView>
    <NameOfLastUsedPublishProfile>配置文件1</NameOfLastUsedPublishProfile>
    <UseIISExpress>true</UseIISExpress>
-    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
    <Use64BitIISExpress />
    <IISExpressSSLPort />
    <IISExpressAnonymousAuthentication />