From 6d247c6559e778ffe52ec5b68580284f453b8bb3 Mon Sep 17 00:00:00 2001
From: hanxuntao <641739520@qq.com>
Date: Thu, 2 Feb 2023 08:45:41 +0800
Subject: [PATCH] 1

---
 .../Controllers/Chfee_AuditController.cs       | 18 ++++++++++--------
 .../Viewsjs/Chfee_Audit/Chfee_AuditBL.js       |  8 ++++----
 .../MsInfoClient/MsInfoClientMinIndex.js       |  5 ++---
 .../Viewsjs/MsOpSeae/MsOpSeaeIndex.js          |  6 ------
 4 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/DSWeb/Areas/Account/Controllers/Chfee_AuditController.cs b/DSWeb/Areas/Account/Controllers/Chfee_AuditController.cs
index 064d7c10..b45c3361 100644
--- a/DSWeb/Areas/Account/Controllers/Chfee_AuditController.cs
+++ b/DSWeb/Areas/Account/Controllers/Chfee_AuditController.cs
@@ -926,14 +926,16 @@ namespace DSWeb.Areas.Account.Controllers
                 {
                     if (profitstatus == "正常")
                     {
-                        sort = sort + 1;
-                        var audit = new MsOpAuditDetail();
-                        audit.SORT = sort;
-                        audit.AUDITDETAILID = "SEA003";
-                        audit.AUDITTYPE = "0";
-                        audit.ERRMSG = "PS分成比例高，公司实际分成比例"+ Math.Round((feettlsum.TTLCR - feettlsum.NOPSTTLCR)/ (feettlsum.TTLDR - feettlsum.NOPSTTLCR), 2, MidpointRounding.AwayFromZero) + "(" + psbl+")";
-                        audit.ERRDATA = "";
-                        auditlist.Add(audit);
+                        if (Math.Round((feettlsum.TTLCR - feettlsum.NOPSTTLCR) / (feettlsum.TTLDR - feettlsum.NOPSTTLCR), 2, MidpointRounding.AwayFromZero)!= psbl) {
+                            sort = sort + 1;
+                            var audit = new MsOpAuditDetail();
+                            audit.SORT = sort;
+                            audit.AUDITDETAILID = "SEA003";
+                            audit.AUDITTYPE = "0";
+                            audit.ERRMSG = "PS分成比例高，公司实际分成比例" + Math.Round((feettlsum.TTLCR - feettlsum.NOPSTTLCR) / (feettlsum.TTLDR - feettlsum.NOPSTTLCR), 2, MidpointRounding.AwayFromZero) + "(" + psbl + ")";
+                            audit.ERRDATA = "";
+                            auditlist.Add(audit);
+                        }
                     }
                     else
                     {
diff --git a/DSWeb/Areas/Account/Viewsjs/Chfee_Audit/Chfee_AuditBL.js b/DSWeb/Areas/Account/Viewsjs/Chfee_Audit/Chfee_AuditBL.js
index ad5d0000..fa8ceddc 100644
--- a/DSWeb/Areas/Account/Viewsjs/Chfee_Audit/Chfee_AuditBL.js
+++ b/DSWeb/Areas/Account/Viewsjs/Chfee_Audit/Chfee_AuditBL.js
@@ -2670,7 +2670,7 @@ Ext.extend(Shipping.MsChfeeAudit, Ext.Panel, {
 
         this.storeSUBMITUSER.load();
         this.comboxSUBMITUSER = Ext.create('DsExt.ux.RefTableCombox', {
-            fieldLabel: Zi.LAN.Operating,//操作
+            fieldLabel: '提交人',//操作
             width: 90,
             store: this.storeSUBMITUSER,
             forceSelection: true,
@@ -2849,7 +2849,7 @@ Ext.extend(Shipping.MsChfeeAudit, Ext.Panel, {
                                     }
                                 }
                             }
-                        }, this.comboxAgent, this.comboxCust, {
+                            }, this.comboxSUBMITUSER, this.comboxCust, {
                             xtype: 'button',
                             width: 90,//执行查询
                             text: Zi.LAN.Executequery,
@@ -4708,8 +4708,8 @@ Ext.extend(Shipping.MsChfeeAudit, Ext.Panel, {
         var CUSTOMERNAME = form.findField('PS_CUSTOMERNAME').getValue();
         sql = sql + getAndConSql(sql, CUSTOMERNAME, "CUSTOMERNAME='" + CUSTOMERNAME + "'");
 
-        var AGENT = form.findField('PS_AGENT').getValue();
-        sql = sql + getAndConSql(sql, AGENT, "AGENTID='" + AGENT + "'");
+        //var AGENT = form.findField('PS_AGENT').getValue();
+        //sql = sql + getAndConSql(sql, AGENT, "AGENTID='" + AGENT + "'");
 
 
         var SALE = form.findField('PS_SALE').getValue();
diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsInfoClient/MsInfoClientMinIndex.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsInfoClient/MsInfoClientMinIndex.js
index 24e3f3d9..a49888e6 100644
--- a/DSWeb/Areas/MvcShipping/Viewsjs/MsInfoClient/MsInfoClientMinIndex.js
+++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsInfoClient/MsInfoClientMinIndex.js
@@ -105,9 +105,8 @@ Ext.extend(Shipping.MsInfoClientMinIndex, Ext.Panel, {
                 sortable: true,
                 id: '',
                 dataIndex: 'ADDR',
-                header: Zi.LAN.ADDR, //'业务锁定',
-                align: 'center',
-                width: 80
+                header: Zi.LAN.ADDR, //'地址',
+                     width: 250
             },
         {
             sortable: true,
diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeIndex.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeIndex.js
index 381b1f7b..9963a662 100644
--- a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeIndex.js
+++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeIndex.js
@@ -7620,12 +7620,6 @@ Ext.extend(Shipping.MsOpSeaeIndex, Ext.Panel, {
             header: Zi.LAN.TTLBILL, //'票数',
             align: 'right',
             width: 100
-            }, {
-                sortable: true,
-                dataIndex: 'AMENDBILL',
-                header: Zi.LAN.AMENDBILL, //'票数',
-                align: 'right',
-                width: 100
             }, {
             sortable: true,
             dataIndex: 'TEU',