From 3a7cb149188b67b6aa9b7d4c4eac26623c079193 Mon Sep 17 00:00:00 2001
From: hanxuntao <641739520@qq.com>
Date: Fri, 15 Mar 2024 10:07:53 +0800
Subject: [PATCH] 1

---
 DSWeb/Areas/MvcShipping/Viewsjs/MsChFee/FeeAmendDrCrGrid.js | 3 +++
 DSWeb/Areas/MvcShipping/Viewsjs/MsChFee/FeeDrCrGrid.js      | 3 +++
 DSWeb/Areas/MvcShipping/Viewsjs/MsChFee/FeeDrCrGridView.js  | 2 ++
 DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeIndex.js   | 2 +-
 DSWeb/DSWeb.csproj.user                                     | 2 +-
 5 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsChFee/FeeAmendDrCrGrid.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsChFee/FeeAmendDrCrGrid.js
index c20e4baf..d5b0b288 100644
--- 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;
                 }
 
diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsChFee/FeeDrCrGrid.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsChFee/FeeDrCrGrid.js
index 9ef72002..ce9f1b17 100644
--- 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;
                 }
                 
diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsChFee/FeeDrCrGridView.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsChFee/FeeDrCrGridView.js
index befc13c2..72fc6771 100644
--- 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;
                 }
 
diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeIndex.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeIndex.js
index e1d16692..8df932ac 100644
--- 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();
diff --git a/DSWeb/DSWeb.csproj.user b/DSWeb/DSWeb.csproj.user
index 5d714467..a8615099 100644
--- 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 />