'20220802_1'

BookingJieFeng/BookingJieFeng.csproj.user

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
     <NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
   </PropertyGroup>
   <ProjectExtensions>

BookingWeb/BookingWeb.csproj.user

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
   </PropertyGroup>
   <ProjectExtensions>
     <VisualStudio>

DSWeb/Areas/MvcShipping/Viewsjs/MsInfoClient/MsInfoClientEdit.js

@@ -1941,7 +1941,16 @@ Ext.extend(Shipping.MsInfoClientEdit, Ext.Panel, {
                     this.formEdit.getForm().setValues(data);
                     this.formACC.getForm().reset();
                     this.formACC.getForm().setValues(data);
-  
+
+                    var editp = Ext.create('MsInfoClientModel', data);
+                    this.editRecord.fields.each(function (field) {
+                        if (field.persist) {
+                            name = field.name;
+                            if (name != 'id')
+                                this.editRecord.set(name, editp.get(name));
+                        }
+                    }, this);
+                    this.editRecord.commit();
 
                     if (this.opStatus == 'add') {
 //                        this.LoadDefValue();

DSWeb/Areas/MvcShipping/Viewsjs/MsSeaeOrder/HistryFeeIndex.js

@@ -63,7 +63,7 @@ Ext.extend(Shipping.SeaeHistryFee, Ext.Panel, {
             }, {
                 sortable: true,
                 dataIndex: 'ORDNO',
-                header: '订舱编号',
+                header: '订单号',
                 width: 120
             }, {
                 sortable: true,

DSWeb/Areas/MvcShipping/Viewsjs/MsSeaeOrder/MsSeaeOrderAudit.js

@@ -59,7 +59,7 @@ Ext.extend(Shipping.MsSeaeOrderAudit, Ext.Panel, {
         }, {
             sortable: true,
             dataIndex: 'ORDNO',
-            header: '订舱编号',
+            header: '订单号',
             width: 120
         }, {
             sortable: true,
@@ -597,7 +597,7 @@ Ext.extend(Shipping.MsSeaeOrderAudit, Ext.Panel, {
                     layout: 'hbox',
                     defaultType: 'textfield',
                     items: [this.comboxStatus, {
-                        fieldLabel: '订舱编号',
+                        fieldLabel: '订单号',
                         name: 'MblNo'
                     }, {
                         fieldLabel: '开船日期',

DSWeb/Areas/MvcShipping/Viewsjs/MsSeaeOrder/MsSeaeOrderEdit.js

@@ -1239,7 +1239,7 @@ Ext.extend(Shipping.MsSeaeOrderEdit, Ext.Panel, {
                     fieldLabel: 'CONFIRMDATE',
                     name: 'CONFIRMDATE', hidden: true
                 }, {
-                    fieldLabel: '订舱号',
+                    fieldLabel: '订单号',
                     readOnly: true,
                     disabled: true,
                     name: 'ORDNO'

DSWeb/Areas/MvcShipping/Viewsjs/MsSeaeOrder/MsSeaeOrderIndex.js

@@ -79,7 +79,7 @@ Ext.extend(Shipping.MsSeaeOrderIndex, Ext.Panel, {
         }, {
             sortable: true,
             dataIndex: 'ORDNO',
-            header: '订舱编号',
+            header: '订单号',
             width: 120
         }, {
             sortable: true,

DSWeb/Areas/MvcShipping/Viewsjs/MsSeaeOrder/MsSeaeWebOrderAudit.js

@@ -56,7 +56,7 @@ Ext.extend(Shipping.MsSeaeWebOrderAudit, Ext.Panel, {
         }, {
             sortable: true,
             dataIndex: 'ORDNO',
-            header: '订舱编号',
+            header: '订单号',
             width: 120
         },
         {
@@ -349,7 +349,7 @@ Ext.extend(Shipping.MsSeaeWebOrderAudit, Ext.Panel, {
                     layout: 'hbox',
                     defaultType: 'textfield',
                     items: [/*this.comboxStatus, */{
-                        fieldLabel: '订舱编号',
+                        fieldLabel: '订单号',
                         name: 'BsNo'
                     }, {
                         fieldLabel: '开船日期',

DSWeb/Areas/MvcShipping/Viewsjs/MsSeaeOrder/MsSeaeWebOrderBillEdit.js

@@ -428,7 +428,7 @@ Ext.extend(Shipping.MsSeaeWebOrderBillEdit, Ext.Panel, {
                     readOnly: true,
                     name: 'CUSTNO'
                 }, {
-                    fieldLabel: '订舱号',
+                    fieldLabel: '订单号',
                     readOnly: true,
                     name: 'ORDNO'
                 }, {

DSWeb/Areas/MvcShipping/Viewsjs/MsSeaeOrder/MsSeaeWebOrderEdit.js

@@ -615,7 +615,7 @@ Ext.extend(Shipping.MsSeaeWebOrderEdit, Ext.Panel, {
                     fieldLabel: 'ORSTATUS',
                     name: 'ORSTATUS', hidden: true
                 }, {
-                    fieldLabel: '订舱号',
+                    fieldLabel: '订单号',
                     readOnly: true,
                     name: 'ORDNO'
                 }, {

DSWeb/Areas/MvcShipping/Viewsjs/MsSeaeOrder/SeaeFee.js

@@ -55,7 +55,7 @@ Ext.extend(Shipping.SeaeFee, Ext.Panel, {
                             fieldLabel: '尺码',
                             name: 'CBM', flex: 0, hidden: true, margins: '0'
                         }, {
-                            fieldLabel: '订舱编号',
+                            fieldLabel: '订单号',
                             readOnly: true,
                             name: 'ORDNO'
                         }, {

DSWeb/DSWeb.csproj.user

@@ -4,7 +4,7 @@
     <ProjectView>ShowAllFiles</ProjectView>
     <NameOfLastUsedPublishProfile>H:\DS7_QDHHYT\DSWeb\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
     <UseIISExpress>true</UseIISExpress>
-    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
     <Use64BitIISExpress />
     <IISExpressSSLPort />
     <IISExpressAnonymousAuthentication />

DispatchWeb/DispatchWeb.csproj.user

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
   </PropertyGroup>
   <ProjectExtensions>
     <VisualStudio>