Merge remote-tracking branch 'origin/dev' into dev

e1292902 · 刘学辉 · e38678f2 · a4b6aa13 · e1292902 · e1292902
Commit e1292902 authored Jul 31, 2024 by 刘学辉
9 changed files
--- a/topsun-xt/src/main/webapp/biz/topsun/sap/costReimbursement/advancePayment.js
+++ b/topsun-xt/src/main/webapp/biz/topsun/sap/costReimbursement/advancePayment.js
@@ -543,6 +543,21 @@ function loadGrid(obj) {
            if ("financeNode" === subProcUnitId){
                initFinancialAuditGridData();
            }
+            if ("fundNode" === subProcUnitId){
+                //如果财务审核是无需付款，付款银行账号非必填
+                var _secondGrid = UICtrl.getGridManager('#financialAuditGrid');
+                if (_secondGrid!=null){
+                    var checked7 = false;
+                    $.each(_secondGrid.currentData.Rows, function (i, row) {
+                        if (row.zepPay == "Y"){
+                            checked7 = true
+                        }
+                    });
+                    if (checked7){
+                        UICtrl.setElRequiredFlag("#bankn1",true)
+                    }
+                }
+            }
        }
    });
    UICtrl.setSearchAreaToggle(obj.gridManager);
@@ -787,7 +802,6 @@ function businessJudgmentUnit() {
    if ("fundNode" === getSubProcUnitId()){
        UICtrl.enable("#bankn1");
        UICtrl.enable("#zepTxt1");
-        UICtrl.setElRequiredFlag("#bankn1",true)
    }
    return true;
 }

--- a/topsun-xt/src/main/webapp/biz/topsun/sap/costReimbursement/costReimbursement.js
+++ b/topsun-xt/src/main/webapp/biz/topsun/sap/costReimbursement/costReimbursement.js
@@ -785,6 +785,21 @@ function loadGrid(obj) {
            if ("financeNode" === subProcUnitId){
                initFinancialAuditGridData();
            }
+            if ("fundNode" === subProcUnitId){
+                //如果财务审核是无需付款，付款银行账号非必填
+                var _secondGrid = UICtrl.getGridManager('#financialAuditGrid');
+                if (_secondGrid!=null){
+                    var checked7 = false;
+                    $.each(_secondGrid.currentData.Rows, function (i, row) {
+                        if (row.zepPay == "Y"){
+                            checked7 = true
+                        }
+                    });
+                    if (checked7){
+                        UICtrl.setElRequiredFlag("#bankn1",true)
+                    }
+                }
+            }
        },
    });
    UICtrl.setSearchAreaToggle(obj.gridManager);
@@ -1113,7 +1128,7 @@ function businessJudgmentUnit() {
    if ("fundNode" === getSubProcUnitId()){
        UICtrl.enable("#bankn1");
        UICtrl.enable("#zepTxt1");
-        UICtrl.setElRequiredFlag("#bankn1",true)
+        //UICtrl.setElRequiredFlag("#bankn1",true)
    }
    return true;
 }

--- a/topsun-xt/src/main/webapp/biz/topsun/sap/costReimbursement/employeeLoan.js
+++ b/topsun-xt/src/main/webapp/biz/topsun/sap/costReimbursement/employeeLoan.js
@@ -555,7 +555,24 @@ function loadGrid(obj) {
                UICtrl.setGridColumns(obj.gridManager,columns);
            }
            return item;
-        }
+        },
+        onAfterShowData:function (){
+            if ("fundNode" === subProcUnitId){
+                //如果财务审核是无需付款，付款银行账号非必填
+                var _secondGrid = UICtrl.getGridManager('#financialAuditGrid');
+                if (_secondGrid!=null){
+                    var checked7 = false;
+                    $.each(_secondGrid.currentData.Rows, function (i, row) {
+                        if (row.zepPay == "Y"){
+                            checked7 = true
+                        }
+                    });
+                    if (checked7){
+                        UICtrl.setElRequiredFlag("#bankn1",true)
+                    }
+                }
+            }
+        },
    });
    UICtrl.setSearchAreaToggle(obj.gridManager);

@@ -817,7 +834,7 @@ function businessJudgmentUnit() {
    if ("fundNode" === getSubProcUnitId()){
        UICtrl.enable("#bankn1");
        UICtrl.enable("#zepTxt1");
-        UICtrl.setElRequiredFlag("#bankn1",true)
+        //UICtrl.setElRequiredFlag("#bankn1",true)
    }
    return true;
 }

--- a/topsun-xt/src/main/webapp/biz/topsun/sap/costReimbursement/payApply.js
+++ b/topsun-xt/src/main/webapp/biz/topsun/sap/costReimbursement/payApply.js
@@ -452,6 +452,7 @@ function loadGrid(obj) {
        checkbox: true,
        fixedCellHeight: true,
        selectRowButtonOnly: true,
+        autoApplyNextEditor:false,
        //onAfterEdit: totalMoney,
        onBeforeCheckRow: function (checked, data) {
            //同时选定或取消所有表格中的对应行
@@ -558,6 +559,21 @@ function loadGrid(obj) {
            if ("financeNode" === subProcUnitId){
                initFinancialAuditGridData();
            }
+            if ("fundNode" === subProcUnitId){
+                //如果财务审核是无需付款，付款银行账号非必填
+                var _secondGrid = UICtrl.getGridManager('#financialAuditGrid');
+                if (_secondGrid!=null){
+                    var checked7 = false;
+                    $.each(_secondGrid.currentData.Rows, function (i, row) {
+                        if (row.zepPay == "Y"){
+                            checked7 = true
+                        }
+                    });
+                    if (checked7){
+                        UICtrl.setElRequiredFlag("#bankn1",true)
+                    }
+                }
+            }
        }
    });
    UICtrl.setSearchAreaToggle(obj.gridManager);
@@ -822,7 +838,6 @@ function businessJudgmentUnit() {
    if ("fundNode" === getSubProcUnitId()){
        UICtrl.enable("#bankn1");
        UICtrl.enable("#zepTxt1");
-        UICtrl.setElRequiredFlag("#bankn1",true)
    }
    return true;
 }

--- a/topsun-xt/src/main/webapp/biz/topsun/sap/costReimbursement/payApplyNoPO.js
+++ b/topsun-xt/src/main/webapp/biz/topsun/sap/costReimbursement/payApplyNoPO.js
@@ -782,6 +782,21 @@ function loadGrid(obj) {
            if ("financeNode" === subProcUnitId){
                initFinancialAuditGridData();
            }
+            if ("fundNode" === subProcUnitId){
+                //如果财务审核是无需付款，付款银行账号非必填
+                var _secondGrid = UICtrl.getGridManager('#financialAuditGrid');
+                if (_secondGrid!=null){
+                    var checked7 = false;
+                    $.each(_secondGrid.currentData.Rows, function (i, row) {
+                        if (row.zepPay == "Y"){
+                            checked7 = true
+                        }
+                    });
+                    if (checked7){
+                        UICtrl.setElRequiredFlag("#bankn1",true)
+                    }
+                }
+            }
        }
    });
    UICtrl.setSearchAreaToggle(obj.gridManager);
@@ -1062,7 +1077,7 @@ function businessJudgmentUnit() {
    if ("fundNode" === getSubProcUnitId()){
        UICtrl.enable("#bankn1");
        UICtrl.enable("#zepTxt1");
-        UICtrl.setElRequiredFlag("#bankn1",true)
+        //UICtrl.setElRequiredFlag("#bankn1",true)
    }
    return true;
 }

--- a/topsun-xt/src/main/webapp/biz/topsun/sap/costReimbursement/refundApply.js
+++ b/topsun-xt/src/main/webapp/biz/topsun/sap/costReimbursement/refundApply.js
@@ -458,6 +458,21 @@ function loadGrid(obj) {
            if ("financeNode" === subProcUnitId){
                initFinancialAuditGridData();
            }
+            if ("fundNode" === subProcUnitId){
+                //如果财务审核是无需付款，付款银行账号非必填
+                var _secondGrid = UICtrl.getGridManager('#financialAuditGrid');
+                if (_secondGrid!=null){
+                    var checked7 = false;
+                    $.each(_secondGrid.currentData.Rows, function (i, row) {
+                        if (row.zepPay == "Y"){
+                            checked7 = true
+                        }
+                    });
+                    if (checked7){
+                        UICtrl.setElRequiredFlag("#bankn1",true)
+                    }
+                }
+            }
        }
    });
    UICtrl.setSearchAreaToggle(obj.gridManager);
@@ -723,7 +738,7 @@ function businessJudgmentUnit() {
    if ("fundNode" === getSubProcUnitId()){
        UICtrl.enable("#bankn1");
        UICtrl.enable("#zepTxt1");
-        UICtrl.setElRequiredFlag("#bankn1",true)
+        //UICtrl.setElRequiredFlag("#bankn1",true)
    }
    return true;
 }

--- a/topsun-xt/src/main/webapp/biz/topsun/sap/nonProducePick/nonProducePickList.jsp
+++ b/topsun-xt/src/main/webapp/biz/topsun/sap/nonProducePick/nonProducePickList.jsp
@@ -14,7 +14,7 @@
        <div position="center" title="非生产性领料申请与发料过账列表">
            <x:title title="common.button.search" hideTable="queryMainForm" isHide="true"/>
            <form class="hg-form ui-hide" method="post" action="" id="queryMainForm">
-                <x:inputC name="billCode" required="false" label="申请单号" labelCol="1"/>
+                <x:inputC name="billCode" required="false" label="单据编号" labelCol="1"/>
                <x:searchButtons/>
            </form>
            <div class="blank_div clearfix"></div>

--- a/topsun/src/main/java/com/huigou/topsun/sap/nonProducePick/domain/query/NonProducePickQueryRequest.java
+++ b/topsun/src/main/java/com/huigou/topsun/sap/nonProducePick/domain/query/NonProducePickQueryRequest.java
@@ -11,4 +11,6 @@ import lombok.Data;
 @Data
 public class NonProducePickQueryRequest extends QueryAbstractRequest {
    private String nonProducePickId;
+    private String billCode;
+    private String message;
 }
--- a/topsun/src/main/resources/config/topsun/sap/nonProducePick/nonProducePick.xml
+++ b/topsun/src/main/resources/config/topsun/sap/nonProducePick/nonProducePick.xml
@@ -5,6 +5,7 @@
            select t.* from sap_non_produce_pick t
        </sql-query>
        <condition column="bill_code" name="billCode" type="java.lang.String" symbol="like" alias="t"/>
+        <condition column="message" name="message" type="java.lang.String" symbol="like" alias="t"/>
    </query>

    <query name="nonProducePickItems" label="SAP非生产性领料申请与发料过账明细" table="sap_non_produce_pick_item">