From b4c033108b54f67ac2411ae339bbade32d0a1eee Mon Sep 17 00:00:00 2001
From: hanxuntao <641739520@qq.com>
Date: Thu, 16 Mar 2023 11:57:09 +0800
Subject: [PATCH] 1

---
 .../Chfee_invoice_HangXin/ChInvoiceAppEdit.js  | 18 ++++++++++--------
 .../Viewsjs/MsOpSeae/MsOpSeaeEdit.js           | 11 +++++++++--
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/DSWeb/Areas/Account/Viewsjs/Chfee_invoice_HangXin/ChInvoiceAppEdit.js b/DSWeb/Areas/Account/Viewsjs/Chfee_invoice_HangXin/ChInvoiceAppEdit.js
index f55a96aa..d30a0e75 100644
--- a/DSWeb/Areas/Account/Viewsjs/Chfee_invoice_HangXin/ChInvoiceAppEdit.js
+++ b/DSWeb/Areas/Account/Viewsjs/Chfee_invoice_HangXin/ChInvoiceAppEdit.js
@@ -2754,7 +2754,7 @@ Ext.extend(Shipping.MsChInvoiceAppEdit, Ext.Panel, {
                     _this.formAMT.getForm().reset();
                     _this.formEdit.getForm().setValues(data);
                     _this.formAMT.getForm().setValues(data);
-                    _this.setInvTile(data.INVOICELINE);
+                    _this.setInvTile(data.INVOICELINEREF);
                     if (this.opStatus == 'copyadd')
                         this.CopyNewData();
                     var companyid = data.SALECORPID;
@@ -5843,13 +5843,15 @@ Ext.extend(Shipping.MsChInvoiceAppEdit, Ext.Panel, {
 
     setInvTile: function (invline) {
         var INVTITLE = Ext.getCmp('INVTITLE');
-        if (invline.indexOf('专用') != -1) {
-            INVTITLE.setText('增值税专用发票', false);
-        } else if (invline.indexOf('电') != -1) {
-            INVTITLE.setText('增值税电子普通发票', false);
-        } else {
-            INVTITLE.setText('增值税普通发票', false);
-        }
+        INVTITLE.setText(invline, false);
+
+        //if (invline.indexOf('专用') != -1) {
+        //    INVTITLE.setText('增值税专用发票', false);
+        //} else if (invline.indexOf('电') != -1) {
+        //    INVTITLE.setText('增值税电子普通发票', false);
+        //} else {
+        //    INVTITLE.setText('增值税普通发票', false);
+        //}
     },
 
     // #region  根据权限和状态判断是否允许修改
diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeEdit.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeEdit.js
index 7e1afa5e..d8831d90 100644
--- a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeEdit.js
+++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeEdit.js
@@ -5159,8 +5159,15 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, {
                     }]
             }, '-', {
                 text: Zi.LAN.GuanBi, //"关闭",
-                handler: function (button, event) {
-                    window.close();
+                    handler: function (button, event) {
+                        var btnESave = Ext.getCmp('btnESave');
+                         
+                        if (btnESave.isDisabled()) {
+                            window.close();
+                        } else {
+                            this.Save('1');
+                        }
+
                 },
                 scope: this
             }, {