From 66da5e839be9887e77330d65335d5400c873e277 Mon Sep 17 00:00:00 2001
From: ddlucky <ddlucky@sina.com>
Date: Thu, 13 Jun 2024 14:04:58 +0800
Subject: [PATCH] =?UTF-8?q?20240613=20=E9=94=80=E5=94=AE=E8=AE=A2=E8=88=B1?=
 =?UTF-8?q?=E3=80=81=E7=BB=BC=E5=90=88=E3=80=81=E6=8A=A5=E5=85=B3=20?=
 =?UTF-8?q?=E4=B8=89=E6=A8=A1=E5=9D=97=E7=9A=84=20=E8=A3=85=E8=B4=A7?=
 =?UTF-8?q?=E6=B8=AF=E5=8D=B8=E8=B4=A7=E6=B8=AF=E4=B8=8B=E6=8B=89=E6=A1=86?=
 =?UTF-8?q?=EF=BC=8C=E6=94=B9=E4=B8=BA=E7=A6=81=E6=AD=A2=E6=89=8B=E5=A1=AB?=
 =?UTF-8?q?=E7=9A=84=E5=90=8C=E6=97=B6=EF=BC=8C=E4=BB=8D=E5=85=81=E8=AE=B8?=
 =?UTF-8?q?=E4=B9=8B=E5=89=8D=E5=B7=B2=E5=A1=AB=E7=9A=84=E6=95=B0=E5=80=BC?=
 =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Viewsjs/MsOpApply/MsOpApplyEdit.js         | 15 ++++++++++++++-
 .../Viewsjs/MsOpOther/MsOpOtherEdit.js         | 15 ++++++++++++++-
 .../Viewsjs/MsSeaeOrder/MsSeaeOrderEdit.js     | 18 ++++++++++++++++++
 3 files changed, 46 insertions(+), 2 deletions(-)

diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpApply/MsOpApplyEdit.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpApply/MsOpApplyEdit.js
index 6a060ddb..e5594977 100644
--- a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpApply/MsOpApplyEdit.js
+++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpApply/MsOpApplyEdit.js
@@ -704,7 +704,7 @@ Ext.extend(Shipping.MsOpApplyEdit, Ext.Panel, {
             proxy: { url: '/CommMng/BasicDataRef/GetCodeDisportListRm' }
         });
         this.comboxPORTDISCHARGE = Ext.create('DsExt.ux.RefTableCombox', {
-            fieldLabel: Zi.LAN.PORTDISCHARGE, //'卸货港',
+            fieldLabel: '卸货港', //'卸货港',
             store: this.storeCodeDisport,
             name: 'PORTDISCHARGE',
             matchFieldWidth: false,
@@ -2498,6 +2498,8 @@ Ext.extend(Shipping.MsOpApplyEdit, Ext.Panel, {
 
                     data = result.data;
 
+                    this.LoadInit(data);
+
                     this.formEdit.getForm().reset();
                     this.formEdit.getForm().setValues(data);
                     this.formHead.getForm().reset();
@@ -2539,6 +2541,17 @@ Ext.extend(Shipping.MsOpApplyEdit, Ext.Panel, {
         this.storeCtnBodyList.load({ params: { condition: condition} });
 
     },
+
+    LoadInit: function (data) {
+
+        var newrec1 = { PORT: data.PORTLOAD, CodeAndName: data.PORTLOAD };
+        this.storeCodeLoadport.add(newrec1);
+
+        var newrec2 = { PORT: data.PORTDISCHARGE, CodeAndName: data.PORTDISCHARGE };
+        this.storeCodeDisport.add(newrec2);
+
+    },
+
     LoadCopyData: function (bsno, CopyFee) {
         this.serialNo = 0;
         Ext.Ajax.request({
diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpOther/MsOpOtherEdit.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpOther/MsOpOtherEdit.js
index 45df8d45..1ce85ec8 100644
--- a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpOther/MsOpOtherEdit.js
+++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpOther/MsOpOtherEdit.js
@@ -450,7 +450,7 @@ Ext.extend(Shipping.MsOpOtherEdit, Ext.Panel, {
             proxy: { url: '/CommMng/BasicDataRef/GetCodeDisportListRm' }
         });
         this.comboxPORTDISCHARGE = Ext.create('DsExt.ux.RefTableCombox', {
-            fieldLabel: Zi.LAN.PORTDISCHARGE, //'卸货港',
+            fieldLabel: '卸货港', //'卸货港',
             store: this.storeCodeDisport,
             name: 'PORTDISCHARGE',
             matchFieldWidth: false,
@@ -1279,6 +1279,9 @@ Ext.extend(Shipping.MsOpOtherEdit, Ext.Panel, {
                         return;
                     }
                     data = result.data;
+
+                    this.LoadInit(data);
+
                     this.formHead.getForm().reset();
                     this.formHead.getForm().setValues(data);
                     this.formEdit.getForm().reset();
@@ -1352,6 +1355,16 @@ Ext.extend(Shipping.MsOpOtherEdit, Ext.Panel, {
         }
 
 
+    },
+
+    LoadInit: function (data) {
+
+        var newrec1 = { PORT: data.PORTLOAD, CodeAndName: data.PORTLOAD };
+        this.storeCodeLoadport.add(newrec1);
+
+        var newrec2 = { PORT: data.PORTDISCHARGE, CodeAndName: data.PORTDISCHARGE };
+        this.storeCodeDisport.add(newrec2);
+
     },
     LoadPeriod: function (opstatus) {
         Ext.Ajax.request({
diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsSeaeOrder/MsSeaeOrderEdit.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsSeaeOrder/MsSeaeOrderEdit.js
index c7747f00..11801e70 100644
--- a/DSWeb/Areas/MvcShipping/Viewsjs/MsSeaeOrder/MsSeaeOrderEdit.js
+++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsSeaeOrder/MsSeaeOrderEdit.js
@@ -3262,6 +3262,8 @@ DFF42726-A0BA-4264-BFDF-2500A35E89C7	isVehiclesDispatcher	是否派车调度人
                     this.formBill.getForm().reset();
                     this.formBill.getForm().setValues(data);
 
+
+
                     if (data.ORSTATUS == 9 || data.ORSTATUS == 2) {
                         this.panelFee.setSaveBtnStatus(true);
                     } else {
@@ -3631,6 +3633,22 @@ DFF42726-A0BA-4264-BFDF-2500A35E89C7	isVehiclesDispatcher	是否派车调度人
     //#region 
 
     LoadInit: function (data) {
+
+        //装货港 卸货港 如果下拉框中不存在此条数据 则增加当前数据
+        //var containsLOADPORT = this.storeCodeLoadport.data.items.some(function (item) {
+        //    return item.data.PORT === data.PORTLOAD;
+        //});
+        //if (!containsLOADPORT) {
+        //    var newrec = { PORT: data.PORTLOAD, CodeAndName: data.PORTLOAD };
+        //    this.storeCodeLoadport.add(newrec);
+        //}
+        var newrec1 = { PORT: data.PORTLOAD, CodeAndName: data.PORTLOAD };
+        this.storeCodeLoadport.add(newrec1);
+
+        var newrec2 = { PORT: data.PORTDISCHARGE, CodeAndName: data.PORTDISCHARGE };
+        this.storeCodeDisport.add(newrec2);
+
+
         var CUSTOMERNAME = data.CUSTOMERNAME;