采购申请审批优化；客户退款、费用报销增加付款事由字段；客户退款申请增加选择异常单

topsun-xt/src/main/webapp/biz/topsun/sap/costReimbursement/costReimbursement.jsp

@@ -73,6 +73,9 @@
                     <x:inputC name="zepPtamount1" required="false" readonly="true" label="审批总金额" labelCol="2" fieldCol="2" mask="positiveMoney"/>
                 </div>
             </div>
+            <div class="hg-form-row">
+                <x:textareaC name="payReason" required="false" label="付款事由" labelCol="2" fieldCol="10" rows="3"/>
+            </div>
         </div>
             <div style="padding-top: 15px;">
                 <x:fileList bizCode="costReimbursement" bizId="id" id="fileList" title="相关资料" />

topsun-xt/src/main/webapp/biz/topsun/sap/costReimbursement/refundApply.js

@@ -483,6 +483,12 @@ function loadGrid(obj) {
                 })
                 UICtrl.setGridColumns(obj.gridManager,columns);
             }
+
+            //选择了客户编码后，根据客户编码查询异常单
+            if (item.column.name == "partner" ){
+                var value = item.value;
+                $("#customerNo").val(value);
+            }
             return item;
         },
         onAfterShowData:function (){
@@ -583,6 +589,18 @@ function bindQueryEvent() {
             $('#zt012kText1').val(data.TEXT1);
         }
     });
+
+    $('#exceptionNo').searchbox({
+        type: "exception", name: "selectException",
+        getParam: function (item) {
+            return {
+                customerNo: $("#customerNo").val()
+            }
+        },
+        onChange: function (value, data) {
+            $('#exceptionNo').val(data.billCode);
+        }
+    });
 }
 
 

topsun-xt/src/main/webapp/biz/topsun/sap/costReimbursement/refundApply.jsp

@@ -23,6 +23,7 @@
         <x:hidden name="positionName"/>
         <x:hidden name="personMemberId"/>
         <x:hidden name="personMemberName"/>
+            <x:hidden name="customerNo"/>
         <div class="hg-form-cols">
             <div class="hg-form-row">
                 <x:inputC name="zepNo" required="false" readonly="true" label="EP流程单号" labelCol="2" maxLength="64" fieldCol="2"/>
@@ -52,6 +53,7 @@
                 </div>
             </div>
             <div class="hg-form-row">
+                <x:inputC name="exceptionNo" required="false" label="异常单编号" labelCol="2" fieldCol="2" wrapper="select"/>
                 <x:inputC name="zepFtamount" required="false"  readonly="true" label="申请总金额（本位币）" labelCol="2" fieldCol="2" mask="positiveMoney"/>
                 <x:inputC name="zepFtamount1" required="false"  readonly="true" label="申请总金额" labelCol="2" fieldCol="2" mask="positiveMoney"/>
             </div>
@@ -59,6 +61,9 @@
                 <x:inputC name="zepPtamount" required="false"  readonly="true" label="审批总金额（本位币）" labelCol="2" fieldCol="2" mask="positiveMoney"/>
                 <x:inputC name="zepPtamount1" required="false"  readonly="true" label="审批总金额" labelCol="2" fieldCol="2" mask="positiveMoney"/>
             </div>
+            <div class="hg-form-row">
+                <x:textareaC name="payReason" required="false" label="付款事由" labelCol="2" fieldCol="10" rows="3"/>
+            </div>
         </div>
         <div class="blank_div clearfix"></div>
         <x:title title="报销人填写" name="group"/>

topsun-xt/src/main/webapp/biz/topsun/sap/purchaseApproval/sapPurchaseApprovalDetail.js

 var itemGridManager = null;
 $(function () {
     $("#toolBar").toolBar("enable", "forceAbortTask");
+    revoke();
     initItemGrid();
     bindEvent();
     var batxt = $("#batxt").val();
@@ -14,6 +15,16 @@ function bindEvent() {
 
 }
 
+function revoke(){
+    var revokeReason = $("#revokeReason").val();
+    if (Public.isNotBlank(revokeReason)) {
+        $("#billTitle .subject").html("采购申请撤审")
+        $("#revoke").show();
+    }else {
+        $("#revoke").hide();
+    }
+}
+
 function initItemGrid() {
     var toolbarOptions = UICtrl.getDefaultToolbarOptions({
         addHandler: function(){

topsun-xt/src/main/webapp/biz/topsun/sap/purchaseApproval/sapPurchaseApprovalDetail.jsp

@@ -31,6 +31,11 @@
                 <x:inputC name="banfn" label="采购申请号" readonly="true"  labelCol="1" fieldCol="2" required="true"/>
                 <x:inputC name="batxt" label="采购申请类型描述" readonly="true" labelCol="1" fieldCol="2" required="false"/>
             </div>
+            <div id="revoke">
+                <div class="hg-form-row">
+                    <x:textareaC name="revokeReason" required="false" label="撤审原因" labelCol="1" fieldCol="5" rows="3"/>
+                </div>
+            </div>
         </div>
         <div id="maingrid"></div>
     </form>

topsun-xt/src/main/webapp/biz/topsun/sap/purchaseApproval/sapPurchaseApprovalList.js

@@ -68,7 +68,8 @@ function initPurchaseListGrid() {
                 {display: "申请人", name: "nameText", width: "100", align: "left", type: "string",},
                 {display: "消息类型", name: "type", width: 100, minWidth: 60, type: "string", align: "center"},
                 {display: "消息文本", name: "message", width: 200, minWidth: 60, type: "string", align: "center"},
-                {display: "创建日期", name: "fillinDate", width: 140, minWidth: 60, type: "date", align: "center"}
+                {display: "创建日期", name: "fillinDate", width: 140, minWidth: 60, type: "date", align: "center"},
+                {display: "撤审原因", name: "revokeReason", width: 300, minWidth: 60, type: "date", align: "center"}
             ],
             dataAction: 'server',
             url: web_app.name + '/sapPurchaseApproval/slicedSapPurchaseApprovalList.ajax?',

topsun-xt/src/main/webapp/biz/topsun/sap/purchaseOrder/sapPurchaseOrderDetail.jsp

@@ -56,7 +56,7 @@
         <div id="revoke">
             <div class="hg-form-cols">
                 <div class="hg-form-row">
-                    <x:textareaC name="revokeReason" required="true" label="撤审原因" labelCol="1" fieldCol="5" rows="3"/>
+                    <x:textareaC name="revokeReason" required="false" label="撤审原因" labelCol="1" fieldCol="5" rows="3"/>
                 </div>
             </div>
         </div>

topsun-xt/src/main/webapp/biz/topsun/sap/purchaseOrder/sapPurchaseOrderList.js

@@ -65,7 +65,7 @@ function loadGrid() {
                 , {display: "项目类别描述", name: "knttp", width: "100", align: "left", type: "string"}
                 , {display: "sap回执", name: "message", width: 200, minWidth: 60, type: "string", align: "center"}
                 , {display: "创建日期", name: "fillinDate", width: 140, minWidth: 60, type: "string", align: "center"}
-
+                , {display: "撤审原因", name: "revokeReason", width: 300, minWidth: 60, type: "date", align: "center"}
             ],
             dataAction: 'server',
             url: web_app.name + '/sapPurchaseOrder/slicedSapPurchaseOrderList.ajax?',

topsun/src/main/java/com/huigou/topsun/sap/costReimbursement/domain/SapCostReimbursement.java

@@ -268,6 +268,12 @@ public class SapCostReimbursement extends FlowBillAbstractEntity {
     @Column(name = "SWIFT")
     private String swift;
 
+    /**
+     * 异常编号
+     */
+    @Column(name = "exception_no")
+    private String exceptionNo;
+
     @Override
     protected String getCodeRuleId() {
         return "sapCostReimbursement";

topsun/src/main/java/com/huigou/topsun/sap/costReimbursement/domain/SapCostReimbursementDetail.java

@@ -460,4 +460,10 @@ public class SapCostReimbursementDetail implements Serializable {
     @Column(name = "zzinvcnr")
     private String zzinvcnr;
 
+    /**
+     * 付款事由
+     */
+    @Column(name = "pay_reason")
+    private String payReason;
+
 }
\ No newline at end of file

topsun/src/main/resources/config/content/easysearch/easy-search-exception.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<easy-search-mappings>
+
+    <easy-search name="selectException" desc="异常单">
+        <sql>
+            select r.bill_code,r.customer_no from sap_exception_report r
+             where r.bill_code not in (select b.exception_no from sap_cost_reimbursement_base_info b where b.exception_no is not null)
+             and r.customer_no is not null and r.customer_no != ''
+        </sql>
+        <field name="异常单编号" title="异常单编号" code="billCode" width="200"/>
+        <field name="客户编号" title="客户编号" code="customerNo" width="200"/>
+        <condition column="customer_no" name="customerNo" symbol="like" alias="r"/>
+        <condition column="bill_code" name="billCode" symbol="like" alias="r"/>
+    </easy-search>
+
+</easy-search-mappings>
\ No newline at end of file