From 49fb876b5eb7ad852956af6630b7c765f1b807e6 Mon Sep 17 00:00:00 2001
From: ddlucky <ddlucky@sina.com>
Date: Fri, 14 Oct 2022 17:52:57 +0800
Subject: [PATCH] '20221014-1'

---
 .../ChInvoiceapplicationIndex.js                | 11 ++++++-----
 .../Chfee_settlement/ChRecvInvsettlementEdit.js | 17 ++++++++++-------
 .../Viewsjs/MsRptOpProfit/MsRptOpProfitIndex.js |  4 ++--
 3 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/DSWeb/Areas/Account/Viewsjs/Chfee_invoiceapplication/ChInvoiceapplicationIndex.js b/DSWeb/Areas/Account/Viewsjs/Chfee_invoiceapplication/ChInvoiceapplicationIndex.js
index d1b18253..a970a185 100644
--- a/DSWeb/Areas/Account/Viewsjs/Chfee_invoiceapplication/ChInvoiceapplicationIndex.js
+++ b/DSWeb/Areas/Account/Viewsjs/Chfee_invoiceapplication/ChInvoiceapplicationIndex.js
@@ -408,8 +408,8 @@ Ext.extend(Shipping.MsChInvoiceapplicationIndex, Ext.Panel, {
                         layout: 'hbox',
                         defaultType: 'textfield',
                         items: [{
-                            fieldLabel: '申请编号',
-                            name: 'ShenNo',
+                            fieldLabel: '编号',
+                            name: 'BsNo',
                             enableKeyEvents: true,
                             listeners: {
                                 specialkey: function (field, e) {
@@ -462,8 +462,8 @@ Ext.extend(Shipping.MsChInvoiceapplicationIndex, Ext.Panel, {
                             defaultType: 'textfield',
                             items: [
                                 {
-                                    fieldLabel: '编号',
-                                    name: 'BsNo',
+                                    fieldLabel: '申请编号',
+                                    name: 'ShenNo',
                                     enableKeyEvents: true,
                                     listeners: {
                                         specialkey: function (field, e) {
@@ -472,7 +472,8 @@ Ext.extend(Shipping.MsChInvoiceapplicationIndex, Ext.Panel, {
                                             }
                                         }
                                     }
-                                },{
+                                },
+                                {
                                     fieldLabel:'开票日期', //从付费申请日期
                                     format: 'Y-m-d',
                                     xtype: 'datefield',
diff --git a/DSWeb/Areas/Account/Viewsjs/Chfee_settlement/ChRecvInvsettlementEdit.js b/DSWeb/Areas/Account/Viewsjs/Chfee_settlement/ChRecvInvsettlementEdit.js
index be8b9f52..2462cae7 100644
--- a/DSWeb/Areas/Account/Viewsjs/Chfee_settlement/ChRecvInvsettlementEdit.js
+++ b/DSWeb/Areas/Account/Viewsjs/Chfee_settlement/ChRecvInvsettlementEdit.js
@@ -1452,9 +1452,9 @@ Ext.extend(Shipping.MsChRecvInvSettlementEdit, Ext.Panel, {
                         xtype: 'container',
                         layout: 'hbox',
                         defaultType: 'textfield',
-                        items: [this.comboxAddCustCode, {
-                            fieldLabel: Zi.LAN.InvoiceNumber,
-                            name: 'CustomNo',
+                        items: [{
+                            fieldLabel: Zi.LAN.Number,
+                            name: 'BsNo',
                             enableKeyEvents: true,
                             listeners: {
                                 specialkey: function (field, e) {
@@ -1464,8 +1464,8 @@ Ext.extend(Shipping.MsChRecvInvSettlementEdit, Ext.Panel, {
                                 }
                             }
                         }, {
-                            fieldLabel: Zi.LAN.Number,
-                            name: 'BsNo',
+                            fieldLabel: Zi.LAN.InvoiceNumber,
+                            name: 'CustomNo',
                             enableKeyEvents: true,
                             listeners: {
                                 specialkey: function (field, e) {
@@ -1474,7 +1474,10 @@ Ext.extend(Shipping.MsChRecvInvSettlementEdit, Ext.Panel, {
                                     }
                                 }
                             }
-                        }, this.comboxCurr2, {
+                        },
+                            this.comboxAddCustCode,
+
+                            this.comboxCurr2, {
                             fieldLabel: Zi.LAN.FromKaiPiaoDate,
                             format: 'Y-m-d',
                             xtype: 'datefield',
@@ -5264,7 +5267,7 @@ Ext.extend(Shipping.MsChRecvInvSettlementEdit, Ext.Panel, {
         var sql = ' (ISDELETE is null or ISDELETE=0) ';
 
         var customNo = form.findField('CustomNo').getValue();
-        sql = sql + getAndConSql(sql, customNo, " (BILLNO like '%" + customNo + "%' or INVOICENO like '%" + customNo + "%')");
+        sql = sql + getAndConSql(sql, customNo, " (BILLNO like '%" + customNo + "%' or INVOICENO like '%" + customNo + "%' or exists(select 1 from ch_fee_invoiceapplication where INVBILLNO=cm.BILLNO and BILLNO like '%" + customNo + "%'))");
 
 
         var CUSTNAME = form.findField('CUSTNAME').getValue();
diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsRptOpProfit/MsRptOpProfitIndex.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsRptOpProfit/MsRptOpProfitIndex.js
index 9fbf1f4d..84033760 100644
--- a/DSWeb/Areas/MvcShipping/Viewsjs/MsRptOpProfit/MsRptOpProfitIndex.js
+++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsRptOpProfit/MsRptOpProfitIndex.js
@@ -13722,10 +13722,10 @@ Ext.extend(Shipping.MsRptOpProfitIndex, Ext.Panel, {
 
         }
 
-        var SUBDEPT = form.findField('SUBDEPT').getValue();
+        var SUBDEPT = form.findField('SUBDEPT').getRawValue();
         if (SUBDEPT) {
             deptstr = ListToSqlStr(SUBDEPT);
-            sql = sql + getAndConSql(sql, deptstr, "B.SALEDEPTGID in(" + deptstr + ")");
+            sql = sql + getAndConSql(sql, deptstr, "B.SALEDEPT in(" + deptstr + ")");
 
         }