From 7d873126a22c1bcd31e7e0a78b6e428e3552939c Mon Sep 17 00:00:00 2001
From: hanxuntao <641739520@qq.com>
Date: Wed, 21 Feb 2024 10:15:54 +0800
Subject: [PATCH] 2

---
 DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeEdit.js  | 2 +-
 DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeIndex.js | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeEdit.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeEdit.js
index bcf6ffe..514ddfb 100644
--- a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeEdit.js
+++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeEdit.js
@@ -3759,7 +3759,7 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, {
                                                     basicForm.findField('ISSUEDATE').setValue(ETD);
                                                 //}
                                                 var FEESTATUSREF = _this.formHead.getForm().findField('FEESTATUSREF').getValue();
-                                                if ((_this.accdatesameetd == 1) && (FEESTATUSREF=='未锁定')) {
+                                                if ((FEESTATUSREF=='未锁定')) {
                                                     var mydatestr = Ext.util.Format.date(ETD, 'Y-m');
                                                     if (_this.MsPeriod.CLOSEDAY != 0) {
                                                         var myday = Ext.util.Format.date(ETD, 'd');
diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeIndex.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeIndex.js
index 33aab3a..539615e 100644
--- a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeIndex.js
+++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeIndex.js
@@ -1835,7 +1835,7 @@ Ext.extend(Shipping.MsOpSeaeIndex, Ext.Panel, {
             //            labelWidth: 48,
             //            flex: 0.7,
             //            forceSelection: true,
-            valueField: 'EDICODE',
+            valueField: 'PORT',
             queryMode: 'remote',
             minChars: 2,
             queryParam: 'PORT',
@@ -1881,7 +1881,7 @@ Ext.extend(Shipping.MsOpSeaeIndex, Ext.Panel, {
             queryMode: 'remote',
             minChars: 2,
             queryParam: 'PORT',
-            valueField: 'EDICODE',
+            valueField: 'PORT',
             displayField: 'CodeAndName',
             enableKeyEvents: true,
             listeners: {
@@ -9349,7 +9349,7 @@ Ext.extend(Shipping.MsOpSeaeIndex, Ext.Panel, {
 
         //卸货港
         var PORTDISCHARGEID = form.findField('PORTDISCHARGEID').getValue();
-        sql = sql + getAndConSql(sql, PORTDISCHARGEID, " (B.PORTDISCHARGEID+' '+B.PORTDISCHARGE) like '%" + PORTDISCHARGEID + "%' ");
+        sql = sql + getAndConSql(sql, PORTDISCHARGEID, " B.PORTDISCHARGE like '%" + PORTDISCHARGEID + "%' ");
 
         //目的港
         var DESTINATIONID = form.findField('DESTINATIONID').getValue();