任务中心中环节描述显示;付款相关页面控制

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

@@ -68,10 +68,6 @@ var tableArray = [
             },
             {
                 display: "BP账号名称", name: "koinh", width: 120, minwidth: 120, type: "string", align: "left",
-                editor: {
-
-                    type: 'text'
-                }
             },
             {
                 display: "BP银行账号", name: "bankn", width: 200, minwidth: 120, type: "string", align: "left",
@@ -96,17 +92,9 @@ var tableArray = [
             },
             {
                 display: "BP联行号", name: "bankl", width: 120, minwidth: 120, type: "string", align: "left",
-                editor: {
-
-                    type: 'text'
-                }
             },
             {
                 display: "SWIFT/BIC", name: "swift", width: 120, minwidth: 120, type: "string", align: "left",
-                editor: {
-
-                    type: 'text'
-                }
             },
             {
                 display: "采购订单号", name: "ebeln", width: 120, minwidth: 120, type: "string", align: "left",
@@ -139,50 +127,12 @@ var tableArray = [
             },
             {
                 display: "采购订单行信息", name: "zekpoItem", width: 300, minwidth: 120, type: "string", align: "left",
-                editor: {
-
-                    type: 'text'
-                }
             },
             {
                 display: "币别", name: "waers", width: 120, minwidth: 120, type: "string", align: "left",
-                /*editor: {
-                    required: true, type: "select",
-                    data: {
-                        type: 'system',
-                        name: "dictionary",
-                        getParam: function (item) {
-                            return {fieldName: "WAERS"}
-                        },
-                        back: {
-                            WAERS: "waers",
-                        }
-                    },
-                }*/
-                editor: {
-
-                    type: 'text'
-                }
             },
             {
                 display: "汇率", name: "kursf", width: 120, minwidth: 120, type: "string", align: "left",
-                /*editor: {
-                    required: true, type: "select",
-                    data: {
-                        type: 'system',
-                        name: "dictionary",
-                        getParam: function (item) {
-                            return {fieldName: "KURSF"}
-                        },
-                        back: {
-                            KURSF: "kursf",
-                        }
-                    },
-                }*/
-                editor: {
-
-                    type: 'text'
-                }
             },
             {
                 display: "含税金额", name: "kzwi1", width: 120, minwidth: 120, type: "money", align: "left",
@@ -392,6 +342,7 @@ var tableArray = [
         ]
     }
 ];
+var isAllData = true;
 
 //创建表格（参数、列、插入的节点、数据源）
 function loadGrid(obj) {
@@ -413,6 +364,15 @@ function loadGrid(obj) {
     if ("financeNode" === subProcUnitId){
         if (obj.node==="financialAuditGrid"){
             canEdit = true;
+            var columns = obj.columns;
+            columns.some(column => {
+                if (column.name == "rstgrName" ||
+                    column.name == "zepPay" ||
+                    column.name == "zepBank" ){
+                    column.editor.required = true;
+                }
+            })
+            obj.columns = columns;
         }
         // else if (obj.node==="capitalPostGrid"){
         //     canDelay = true;
@@ -608,6 +568,7 @@ function getExtendedData(processAction) {
     if (processAction == ProcessAction.BACK
         || processAction == ProcessAction.REPLENISH
         || processAction == ProcessAction.TRANSMIT) {
+        isAllData = false
         //不验证
         $('#submitForm').attr('check', false);
     }
@@ -632,10 +593,58 @@ function getExtendedData(processAction) {
 
 }
 
+//提交前校验
+function checkConstraints() {
+    //原因代码、是否付款、直联付款标识必输，且如果为多行的话，这三个字段的值必须相同，不相同报错提示，不允许提交
+    var subProcUnitId = getSubProcUnitId();
+    //财务审核
+    if ("financeNode" === subProcUnitId){
+        var _grid = UICtrl.getGridManager('#financialAuditGrid');
+        var datas = DataUtil.getGridData({
+            gridManager: _grid,
+            isAllData: true,
+            onCheck: function () {
+                return true;
+            }
+        });
+        if (!datas) {
+            return false;
+        }
+        var checked1 = false
+        var checked2 = false
+        var checked3 = false
+        $.each(datas, function (i, o) {
+            if (o.rstgrName != datas[0].rstgrName ){
+                checked1 = true
+            }
+            if (o.zepPay != datas[0].zepPay ){
+                checked2 = true
+            }
+            if (o.zepBank != datas[0].zepBank ){
+                checked3 = true
+            }
+        });
+        if (checked1) {
+            Public.tip("原因代码不一致")
+            return false
+        }
+        if (checked2) {
+            Public.tip("是否付款不一致")
+            return false
+        }
+        if (checked3) {
+            Public.tip("直联付款标识不一致")
+            return false
+        }
+    }
+
+    return true;
+}
+
 function getTableDataAll(obj) {
     let result = DataUtil.getGridData({
         gridManager: obj.gridManager,
-        isAllData: true
+        isAllData: isAllData
     });
     return result;
 }

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

@@ -52,7 +52,7 @@
             </div>
             <div class="hg-form-row">
                 <x:inputC name="zepAppliname" required="false" readonly="true" label="EP流程申请人" labelCol="2" fieldCol="2"/>
-                <x:inputC name="zepTxt" required="false" label="付款申请内容" labelCol="2" fieldCol="2"/>
+                <x:inputC name="zepTxt" required="true" label="付款申请内容" labelCol="2" fieldCol="2"/>
             </div>
             <div class="hg-form-row">
                 <x:inputC name="zepFtamount" required="false" readonly="true" label="申请总金额（本位币）" labelCol="2" fieldCol="2" mask="positiveMoney"/>

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

@@ -54,9 +54,6 @@ var tableArray = [
             },
             {
                 display: "BP标识描述", name: "zepBptypename", width: 120, minwidth: 120, type: "string", align: "left",
-                editor: {
-                    type: 'text'
-                }
             },
             {
                 display: "BP(合作伙伴)", name: "partner", width: 120, minwidth: 120, type: "string", align: "left",
@@ -83,9 +80,6 @@ var tableArray = [
             },
             {
                 display: "BP账号名称", name: "koinh", width: 120, minwidth: 120, type: "string", align: "left",
-                editor: {
-                    type: 'text'
-                }
             },
             {
                 display: "BP银行账号", name: "bankn", width: 200, minwidth: 120, type: "string", align: "left",
@@ -110,15 +104,9 @@ var tableArray = [
             },
             {
                 display: "BP联行号", name: "bankl", width: 200, minwidth: 120, type: "string", align: "left",
-                editor: {
-                    type: 'text'
-                }
             },
             {
                 display: "SWIFT/BIC", name: "swift", width: 120, minwidth: 120, type: "string", align: "left",
-                editor: {
-                    type: 'text'
-                }
             },
             {
                 display: "费用类型代码", name: "zepExtype", width: 120, minwidth: 120, type: "string", align: "left",
@@ -146,28 +134,16 @@ var tableArray = [
                 minwidth: 120,
                 type: "string",
                 align: "left",
-                editor: {
-                    type: 'text'
-                }
             },
             {
                 display: "费用会计科目", name: "hkont", width: 120, minwidth: 120, type: "string", align: "left",
-                editor: {
-
-                    type: 'text'
-                }
             },
             {
                 display: "总账科目描述", name: "txt50", width: 120, minwidth: 120, type: "string", align: "left",
-                editor: {
-
-                    type: 'text'
-                }
             },
             {
                 display: "计划付款日期", name: "zepFpldate", width: 120, minwidth: 120, type: "string", align: "left",
                 editor: {
-
                     type: 'date'
                 }
             },
@@ -190,9 +166,6 @@ var tableArray = [
             },
             {
                 display: "成本中心名称", name: "ktext1", width: 120, minwidth: 120, type: "string", align: "left",
-                editor: {
-                    type: 'text'
-                }
             },
             {
                 display: "内部订单", name: "aufnr", width: 120, minwidth: 120, type: "string", align: "left",
@@ -215,9 +188,6 @@ var tableArray = [
             },
             {
                 display: "内部订单描述", name: "ktext", width: 200, minwidth: 120, type: "string", align: "left",
-                editor: {
-                    type: 'text'
-                }
             },
             {
                 display: "发票号码", name: "zyl06", width: 200, minwidth: 120, type: "string", align: "left",
@@ -241,7 +211,7 @@ var tableArray = [
                     },
                 }*/
                 editor: {
-                    type: 'text'
+                    type: 'text',required: true
                 }
             },
             {
@@ -261,14 +231,14 @@ var tableArray = [
                 }*/
                 editor: {
                     mask: 'nnnnnnnnn.nn',
-                    type: 'text'
+                    type: 'text',required: true
                 }
             },
             {
                 display: "含税金额", name: "kzwi1", width: 120, minwidth: 120, type: "money", align: "left",
                 editor: {
                     mask: 'nnnnnnnnn.nn',
-                    type: 'text'
+                    type: 'text',required: true
                 }
             },
             {
@@ -278,7 +248,7 @@ var tableArray = [
                     data: {name: 'mwskz'},
                     textField: 'mwskzTextView',
                     valueField: 'mwskz',
-                    required: false,
+                    required: true,
                     render: function (item) {
                         return item.mwskzTextView;
                     }
@@ -288,7 +258,7 @@ var tableArray = [
                 display: "税额", name: "kwetr", width: 120, minwidth: 120, type: "money", align: "left",
                 editor: {
                     mask: 'nnnnnnnnn.nn',
-                    type: 'text'
+                    type: 'text',required: true
                 },
                 //等于含税金额/(1+税码对应的税率）*税码对应税率，可手工修改
                 // render:function(item){
@@ -534,6 +504,7 @@ var tableArray = [
         ]
     }
 ]
+var isAllData = true;
 
 
 //创建表格（参数、列、插入的节点、数据源）
@@ -556,6 +527,15 @@ function loadGrid(obj) {
     if ("financeNode" === subProcUnitId){
         if (obj.node==="financialAuditGrid"){
             canEdit = true;
+            var columns = obj.columns;
+            columns.some(column => {
+                if (column.name == "rstgrName" ||
+                    column.name == "zepPay" ||
+                    column.name == "zepBank" ){
+                    column.editor.required = true;
+                }
+            })
+            obj.columns = columns;
         }
         // else if (obj.node==="capitalPostGrid"){
         //     canDelay = true;
@@ -604,7 +584,7 @@ function loadGrid(obj) {
                         }
                         var newRow = JSON.parse(JSON.stringify(row));
                         newRow.zepItemno = getZepItemNo();
-                        newRow.id = null;
+                        newRow.reimbursementDetailId = null;
                         UICtrl.addGridRow(item.gridManager, newRow);
                     });
                 }
@@ -690,7 +670,7 @@ function loadGrid(obj) {
             if ("financeNode" === subProcUnitId){
                 initFinancialAuditGridData();
             }
-        }
+        },
     });
     UICtrl.setSearchAreaToggle(obj.gridManager);
 
@@ -781,11 +761,12 @@ function getId() {
 }
 
 function getExtendedData(processAction) {
-
+    var handleResult=getHandleResult();
     //回退、打回、转交时，不需要验证必填项是否已经填写；
     if (processAction == ProcessAction.BACK
         || processAction == ProcessAction.REPLENISH
-        || processAction == ProcessAction.TRANSMIT) {
+        || processAction == ProcessAction.TRANSMIT || "2" == handleResult) {
+        isAllData = false
         //不验证
         $('#submitForm').attr('check', false);
     }
@@ -810,10 +791,80 @@ function getExtendedData(processAction) {
 
 }
 
+//提交前校验
+function checkConstraints() {
+    //判断成本中心、内部订单必输1个，可以同时都输入
+    var _grid = UICtrl.getGridManager('#reimbursementApplierGrid');
+    var datas = DataUtil.getGridData({
+        gridManager: _grid,
+        isAllData: true,
+        onCheck: function () {
+            return true;
+        }
+    });
+    if (!datas) {
+        return false;
+    }
+    var checked = false
+    $.each(datas, function (i, o) {
+        if (Public.isBlank(o.kostl) && Public.isBlank(o.aufnr)){
+            checked = true
+        }
+    });
+    if (checked) {
+        Public.tip("成本中心、内部订单必输1个，可以同时都输入")
+        return false
+    }
+    //原因代码、是否付款、直联付款标识必输，且如果为多行的话，这三个字段的值必须相同，不相同报错提示，不允许提交
+    var subProcUnitId = getSubProcUnitId();
+    //财务审核
+    if ("financeNode" === subProcUnitId){
+        var _grid = UICtrl.getGridManager('#financialAuditGrid');
+        var datas = DataUtil.getGridData({
+            gridManager: _grid,
+            isAllData: true,
+            onCheck: function () {
+                return true;
+            }
+        });
+        if (!datas) {
+            return false;
+        }
+        var checked1 = false
+        var checked2 = false
+        var checked3 = false
+        $.each(datas, function (i, o) {
+            if (o.rstgrName != datas[0].rstgrName ){
+                checked1 = true
+            }
+            if (o.zepPay != datas[0].zepPay ){
+                checked2 = true
+            }
+            if (o.zepBank != datas[0].zepBank ){
+                checked3 = true
+            }
+        });
+        if (checked1) {
+            Public.tip("原因代码不一致")
+            return false
+        }
+        if (checked2) {
+            Public.tip("是否付款不一致")
+            return false
+        }
+        if (checked3) {
+            Public.tip("直联付款标识不一致")
+            return false
+        }
+    }
+
+    return true;
+}
+
 function getTableDataAll(obj) {
     let result = DataUtil.getGridData({
         gridManager: obj.gridManager,
-        isAllData: true
+        isAllData: isAllData
     });
     return result;
 }
@@ -843,7 +894,7 @@ function businessJudgmentUnit() {
     var isApply = isApplyProcUnit();
     if (isApply) {
         $("#approvalMoney").hide();
-        //$("#financialAudit").hide();
+        $("#financialAudit").hide();
         $("#financialAudit_sapReturn").hide();
         $("#capitalPost").hide();
         $("#paymentAccomplish_sapReturn").hide();

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

@@ -41,7 +41,7 @@
             </div>
             <div class="hg-form-row">
                 <x:inputC name="zepAppliname" required="false" readonly="true" label="EP流程申请人" labelCol="2" fieldCol="2"/>
-                <x:inputC name="zepTxt" required="false" label="付款申请内容" labelCol="2" fieldCol="2"/>
+                <x:inputC name="zepTxt" required="true" label="付款申请内容" labelCol="2" fieldCol="2"/>
                 <x:inputC name="employeeLoanBillCode" required="false" label="员工借款编号" labelCol="2" fieldCol="2" wrapper="select"/>
             </div>
             <div id="capitalPost">

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

@@ -64,10 +64,6 @@ var tableArray = [
             },
             {
                 display: "BP账号名称", name: "koinh", width: 120, minwidth: 120, type: "string", align: "left",
-                editor: {
-
-                    type: 'text'
-                }
             },
             {
                 display: "BP银行账号", name: "bankn", width: 200, minwidth: 120, type: "string", align: "left",
@@ -92,17 +88,9 @@ var tableArray = [
             },
             {
                 display: "BP联行号", name: "bankl", width: 200, minwidth: 120, type: "string", align: "left",
-                editor: {
-
-                    type: 'text'
-                }
             },
             {
                 display: "SWIFT/BIC", name: "swift", width: 120, minwidth: 120, type: "string", align: "left",
-                editor: {
-
-                    type: 'text'
-                }
             },
             {
                 display: "计划付款日期", name: "zepFpldate", width: 120, minwidth: 120, type: "string", align: "left",
@@ -382,7 +370,7 @@ var tableArray = [
         ]
     }
 ]
-
+var isAllData = true;
 
 //创建表格（参数、列、插入的节点、数据源）
 function loadGrid(obj) {
@@ -403,6 +391,15 @@ function loadGrid(obj) {
     if ("financeNode" === subProcUnitId){
         if (obj.node==="financialAuditGrid"){
             canEdit = true;
+            var columns = obj.columns;
+            columns.some(column => {
+                if (column.name == "rstgrName" ||
+                    column.name == "zepPay" ||
+                    column.name == "zepBank" ){
+                    column.editor.required = true;
+                }
+            })
+            obj.columns = columns;
         }
         // else if (obj.node==="capitalPostGrid"){
         //     canDelay = true;
@@ -417,7 +414,7 @@ function loadGrid(obj) {
         toolbarOptions = UICtrl.getDefaultToolbarOptions({
             addHandler: function () {
                 tableArray.forEach((item) => {
-                    UICtrl.addGridRow(item.gridManager, {zepItemno: getZepItemNo(),zepBptype:"E",zepBptypename:"员工"});
+                    UICtrl.addGridRow(item.gridManager, {zepItemno: getZepItemNo(),zepBptype:"E",zepBptypename:"员工",waers:"CNY",kursf:"1"});
                 });
             },
             deleteHandler: function () {
@@ -591,6 +588,7 @@ function getExtendedData(processAction) {
     if (processAction == ProcessAction.BACK
         || processAction == ProcessAction.REPLENISH
         || processAction == ProcessAction.TRANSMIT) {
+        isAllData = false
         //不验证
         $('#submitForm').attr('check', false);
     }
@@ -615,10 +613,58 @@ function getExtendedData(processAction) {
 
 }
 
+//提交前校验
+function checkConstraints() {
+    //原因代码、是否付款、直联付款标识必输，且如果为多行的话，这三个字段的值必须相同，不相同报错提示，不允许提交
+    var subProcUnitId = getSubProcUnitId();
+    //财务审核
+    if ("financeNode" === subProcUnitId){
+        var _grid = UICtrl.getGridManager('#financialAuditGrid');
+        var datas = DataUtil.getGridData({
+            gridManager: _grid,
+            isAllData: true,
+            onCheck: function () {
+                return true;
+            }
+        });
+        if (!datas) {
+            return false;
+        }
+        var checked1 = false
+        var checked2 = false
+        var checked3 = false
+        $.each(datas, function (i, o) {
+            if (o.rstgrName != datas[0].rstgrName ){
+                checked1 = true
+            }
+            if (o.zepPay != datas[0].zepPay ){
+                checked2 = true
+            }
+            if (o.zepBank != datas[0].zepBank ){
+                checked3 = true
+            }
+        });
+        if (checked1) {
+            Public.tip("原因代码不一致")
+            return false
+        }
+        if (checked2) {
+            Public.tip("是否付款不一致")
+            return false
+        }
+        if (checked3) {
+            Public.tip("直联付款标识不一致")
+            return false
+        }
+    }
+
+    return true;
+}
+
 function getTableDataAll(obj) {
     let result = DataUtil.getGridData({
         gridManager: obj.gridManager,
-        isAllData: true
+        isAllData: isAllData
     });
     return result;
 }

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

@@ -38,7 +38,7 @@
             </div>
             <div class="hg-form-row">
                 <x:inputC name="zepAppliname" required="false" readonly="true" label="EP流程申请人" labelCol="2" fieldCol="2"/>
-                <x:inputC name="zepTxt" required="false" label="付款申请内容" labelCol="2" fieldCol="6"/>
+                <x:inputC name="zepTxt" required="true" label="付款申请内容" labelCol="2" fieldCol="6"/>
             </div>
             <div id="capitalPost">
                 <div class="hg-form-row">

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

@@ -72,10 +72,6 @@ var tableArray = [
             },
             {
                 display: "BP账号名称", name: "koinh", width: 120, minwidth: 120, type: "string", align: "left",
-                editor: {
-
-                    type: 'text'
-                }
             },
             {
                 display: "BP银行账号", name: "bankn", width: 120, minwidth: 120, type: "string", align: "left",
@@ -100,17 +96,9 @@ var tableArray = [
             },
             {
                 display: "BP联行号", name: "bankl", width: 120, minwidth: 120, type: "string", align: "left",
-                editor: {
-
-                    type: 'text'
-                }
             },
             {
                 display: "SWIFT/BIC", name: "swift", width: 120, minwidth: 120, type: "string", align: "left",
-                editor: {
-
-                    type: 'text'
-                }
             },
             {
                 display: "采购发票号", name: "belnr2", width: 120, minwidth: 120, type: "string", align: "left",
@@ -159,17 +147,17 @@ var tableArray = [
             },
             {
                 display: "币别", name: "waers", width: 120, minwidth: 120, type: "string", align: "left",
-                editor: {
-
-                    type: 'text'
-                }
+                // editor: {
+                //
+                //     type: 'text'
+                // }
             },
             {
                 display: "汇率", name: "kursf", width: 120, minwidth: 120, type: "string", align: "left",
-                editor: {
-
-                    type: 'text'
-                }
+                // editor: {
+                //
+                //     type: 'text'
+                // }
             },
 
             {
@@ -364,7 +352,8 @@ var tableArray = [
             {display: "付款状态", name: "zpayStaus", width: 120, minwidth: 120, type: "string", align: "left"}
         ]
     }
-]
+];
+var isAllData = true;
 
 
 //创建表格（参数、列、插入的节点、数据源）
@@ -387,6 +376,15 @@ function loadGrid(obj) {
     if ("financeNode" === subProcUnitId){
         if (obj.node==="financialAuditGrid"){
             canEdit = true;
+            var columns = obj.columns;
+            columns.some(column => {
+                if (column.name == "rstgrName" ||
+                    column.name == "zepPay" ||
+                    column.name == "zepBank" ){
+                    column.editor.required = true;
+                }
+            })
+            obj.columns = columns;
         }
         // else if (obj.node==="capitalPostGrid"){
         //     canDelay = true;
@@ -603,6 +601,7 @@ function getExtendedData(processAction) {
     if (processAction == ProcessAction.BACK
         || processAction == ProcessAction.REPLENISH
         || processAction == ProcessAction.TRANSMIT) {
+        isAllData = false
         //不验证
         $('#submitForm').attr('check', false);
     }
@@ -627,10 +626,58 @@ function getExtendedData(processAction) {
 
 }
 
+//提交前校验
+function checkConstraints() {
+    //原因代码、是否付款、直联付款标识必输，且如果为多行的话，这三个字段的值必须相同，不相同报错提示，不允许提交
+    var subProcUnitId = getSubProcUnitId();
+    //财务审核
+    if ("financeNode" === subProcUnitId){
+        var _grid = UICtrl.getGridManager('#financialAuditGrid');
+        var datas = DataUtil.getGridData({
+            gridManager: _grid,
+            isAllData: true,
+            onCheck: function () {
+                return true;
+            }
+        });
+        if (!datas) {
+            return false;
+        }
+        var checked1 = false
+        var checked2 = false
+        var checked3 = false
+        $.each(datas, function (i, o) {
+            if (o.rstgrName != datas[0].rstgrName ){
+                checked1 = true
+            }
+            if (o.zepPay != datas[0].zepPay ){
+                checked2 = true
+            }
+            if (o.zepBank != datas[0].zepBank ){
+                checked3 = true
+            }
+        });
+        if (checked1) {
+            Public.tip("原因代码不一致")
+            return false
+        }
+        if (checked2) {
+            Public.tip("是否付款不一致")
+            return false
+        }
+        if (checked3) {
+            Public.tip("直联付款标识不一致")
+            return false
+        }
+    }
+
+    return true;
+}
+
 function getTableDataAll(obj) {
     let result = DataUtil.getGridData({
         gridManager: obj.gridManager,
-        isAllData: true
+        isAllData: isAllData
     });
     return result;
 }

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

@@ -43,7 +43,7 @@
             <div class="hg-form-row">
                 <x:inputC name="zepAppliname" required="false" readonly="true" label="EP流程申请人" labelCol="2" fieldCol="2"/>
                 <x:inputC name="zepFcrdate" wrapper="date" readonly="true" required="false" label="付款申请创建日期" labelCol="2" fieldCol="2"/>
-                <x:inputC name="zepTxt" required="false" label="付款申请内容" labelCol="2" fieldCol="2"/>
+                <x:inputC name="zepTxt" required="true" label="付款申请内容" labelCol="2" fieldCol="2"/>
             </div>
             <div id="capitalPost">
                 <div class="hg-form-row">

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

@@ -83,9 +83,6 @@ var tableArray = [
             },
             {
                 display: "BP账号名称", name: "koinh", width: 120, minwidth: 120, type: "string", align: "left",
-                editor: {
-                    type: 'text'
-                }
             },
             {
                 display: "BP银行账号", name: "bankn", width: 200, minwidth: 120, type: "string", align: "left",
@@ -110,15 +107,9 @@ var tableArray = [
             },
             {
                 display: "BP联行号", name: "bankl", width: 200, minwidth: 120, type: "string", align: "left",
-                editor: {
-                    type: 'text'
-                }
             },
             {
                 display: "SWIFT/BIC", name: "swift", width: 120, minwidth: 120, type: "string", align: "left",
-                editor: {
-                    type: 'text'
-                }
             },
             {
                 display: "费用类型代码", name: "zepExtype", width: 120, minwidth: 120, type: "string", align: "left",
@@ -146,23 +137,12 @@ var tableArray = [
                 minwidth: 120,
                 type: "string",
                 align: "left",
-                editor: {
-                    type: 'text'
-                }
             },
             {
                 display: "费用会计科目", name: "hkont", width: 120, minwidth: 120, type: "string", align: "left",
-                editor: {
-
-                    type: 'text'
-                }
             },
             {
                 display: "总账科目描述", name: "txt50", width: 120, minwidth: 120, type: "string", align: "left",
-                editor: {
-
-                    type: 'text'
-                }
             },
             {
                 display: "计划付款日期", name: "zepFpldate", width: 120, minwidth: 120, type: "string", align: "left",
@@ -190,9 +170,6 @@ var tableArray = [
             },
             {
                 display: "成本中心名称", name: "ktext1", width: 120, minwidth: 120, type: "string", align: "left",
-                editor: {
-                    type: 'text'
-                }
             },
             {
                 display: "内部订单", name: "aufnr", width: 120, minwidth: 120, type: "string", align: "left",
@@ -215,9 +192,6 @@ var tableArray = [
             },
             {
                 display: "内部订单描述", name: "ktext", width: 200, minwidth: 120, type: "string", align: "left",
-                editor: {
-                    type: 'text'
-                }
             },
             {
                 display: "发票号码", name: "zyl06", width: 200, minwidth: 120, type: "string", align: "left",
@@ -533,7 +507,8 @@ var tableArray = [
             {display: "付款状态", name: "zpayStaus", width: 120, minwidth: 120, type: "string", align: "left"}
         ]
     }
-]
+];
+var isAllData = true;
 
 
 //创建表格（参数、列、插入的节点、数据源）
@@ -556,6 +531,15 @@ function loadGrid(obj) {
     if ("financeNode" === subProcUnitId){
         if (obj.node==="financialAuditGrid"){
             canEdit = true;
+            var columns = obj.columns;
+            columns.some(column => {
+                if (column.name == "rstgrName" ||
+                    column.name == "zepPay" ||
+                    column.name == "zepBank" ){
+                    column.editor.required = true;
+                }
+            })
+            obj.columns = columns;
         }
         // else if (obj.node==="capitalPostGrid"){
         //     canDelay = true;
@@ -789,6 +773,7 @@ function getExtendedData(processAction) {
     if (processAction == ProcessAction.BACK
         || processAction == ProcessAction.REPLENISH
         || processAction == ProcessAction.TRANSMIT) {
+        isAllData = false
         //不验证
         $('#submitForm').attr('check', false);
     }
@@ -813,10 +798,80 @@ function getExtendedData(processAction) {
 
 }
 
+//提交前校验
+function checkConstraints() {
+    //判断成本中心、内部订单必输1个，可以同时都输入
+    var _grid = UICtrl.getGridManager('#reimbursementApplierGrid');
+    var datas = DataUtil.getGridData({
+        gridManager: _grid,
+        isAllData: true,
+        onCheck: function () {
+            return true;
+        }
+    });
+    if (!datas) {
+        return false;
+    }
+    var checked = false
+    $.each(datas, function (i, o) {
+        if (Public.isBlank(o.kostl) && Public.isBlank(o.aufnr)){
+            checked = true
+        }
+    });
+    if (checked) {
+        Public.tip("成本中心、内部订单必输1个，可以同时都输入")
+        return false
+    }
+    //原因代码、是否付款、直联付款标识必输，且如果为多行的话，这三个字段的值必须相同，不相同报错提示，不允许提交
+    var subProcUnitId = getSubProcUnitId();
+    //财务审核
+    if ("financeNode" === subProcUnitId){
+        var _grid = UICtrl.getGridManager('#financialAuditGrid');
+        var datas = DataUtil.getGridData({
+            gridManager: _grid,
+            isAllData: true,
+            onCheck: function () {
+                return true;
+            }
+        });
+        if (!datas) {
+            return false;
+        }
+        var checked1 = false
+        var checked2 = false
+        var checked3 = false
+        $.each(datas, function (i, o) {
+            if (o.rstgrName != datas[0].rstgrName ){
+                checked1 = true
+            }
+            if (o.zepPay != datas[0].zepPay ){
+                checked2 = true
+            }
+            if (o.zepBank != datas[0].zepBank ){
+                checked3 = true
+            }
+        });
+        if (checked1) {
+            Public.tip("原因代码不一致")
+            return false
+        }
+        if (checked2) {
+            Public.tip("是否付款不一致")
+            return false
+        }
+        if (checked3) {
+            Public.tip("直联付款标识不一致")
+            return false
+        }
+    }
+
+    return true;
+}
+
 function getTableDataAll(obj) {
     let result = DataUtil.getGridData({
         gridManager: obj.gridManager,
-        isAllData: true
+        isAllData: isAllData
     });
     return result;
 }

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

@@ -41,7 +41,7 @@
             </div>
             <div class="hg-form-row">
                 <x:inputC name="zepAppliname" required="false" readonly="true" label="EP流程申请人" labelCol="2" fieldCol="2"/>
-                <x:inputC name="zepTxt" required="false" label="付款申请内容" labelCol="2" fieldCol="2"/>
+                <x:inputC name="zepTxt" required="true" label="付款申请内容" labelCol="2" fieldCol="2"/>
                 <!--x:inputC name="employeeLoanBillCode" required="false" label="员工借款编号" labelCol="2" fieldCol="2" wrapper="select" /-->
             </div>
             <div id="capitalPost">

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

@@ -65,10 +65,6 @@ var tableArray = [
             },
             {
                 display: "BP账号名称", name: "koinh", width: 120, minwidth: 120, type: "string", align: "left",
-                editor: {
-
-                    type: 'text'
-                }
             },
             {
                 display: "BP银行账号", name: "bankn", width: 200, minwidth: 120, type: "string", align: "left",
@@ -93,17 +89,9 @@ var tableArray = [
             },
             {
                 display: "BP联行号", name: "bankl", width: 120, minwidth: 120, type: "string", align: "left",
-                editor: {
-
-                    type: 'text'
-                }
             },
             {
                 display: "SWIFT/BIC", name: "swift", width: 120, minwidth: 120, type: "string", align: "left",
-                editor: {
-
-                    type: 'text'
-                }
             },
             {
                 display: "币别", name: "waers", width: 120, minwidth: 120, type: "string", align: "left",
@@ -311,7 +299,8 @@ var tableArray = [
             {display: "付款状态", name: "zpayStaus", width: 120, minwidth: 120, type: "string", align: "left"}
         ]
     }
-]
+];
+var isAllData = true;
 
 
 //创建表格（参数、列、插入的节点、数据源）
@@ -334,6 +323,15 @@ function loadGrid(obj) {
     if ("financeNode" === subProcUnitId){
         if (obj.node==="financialAuditGrid"){
             canEdit = true;
+            var columns = obj.columns;
+            columns.some(column => {
+                if (column.name == "rstgrName" ||
+                    column.name == "zepPay" ||
+                    column.name == "zepBank" ){
+                    column.editor.required = true;
+                }
+            })
+            obj.columns = columns;
         }
         // else if (obj.node==="capitalPostGrid"){
         //     canDelay = true;
@@ -549,6 +547,7 @@ function getExtendedData(processAction) {
     if (processAction == ProcessAction.BACK
         || processAction == ProcessAction.REPLENISH
         || processAction == ProcessAction.TRANSMIT) {
+        isAllData = false
         //不验证
         $('#submitForm').attr('check', false);
     }
@@ -573,10 +572,58 @@ function getExtendedData(processAction) {
 
 }
 
+//提交前校验
+function checkConstraints() {
+    //原因代码、是否付款、直联付款标识必输，且如果为多行的话，这三个字段的值必须相同，不相同报错提示，不允许提交
+    var subProcUnitId = getSubProcUnitId();
+    //财务审核
+    if ("financeNode" === subProcUnitId){
+        var _grid = UICtrl.getGridManager('#financialAuditGrid');
+        var datas = DataUtil.getGridData({
+            gridManager: _grid,
+            isAllData: true,
+            onCheck: function () {
+                return true;
+            }
+        });
+        if (!datas) {
+            return false;
+        }
+        var checked1 = false
+        var checked2 = false
+        var checked3 = false
+        $.each(datas, function (i, o) {
+            if (o.rstgrName != datas[0].rstgrName ){
+                checked1 = true
+            }
+            if (o.zepPay != datas[0].zepPay ){
+                checked2 = true
+            }
+            if (o.zepBank != datas[0].zepBank ){
+                checked3 = true
+            }
+        });
+        if (checked1) {
+            Public.tip("原因代码不一致")
+            return false
+        }
+        if (checked2) {
+            Public.tip("是否付款不一致")
+            return false
+        }
+        if (checked3) {
+            Public.tip("直联付款标识不一致")
+            return false
+        }
+    }
+
+    return true;
+}
+
 function getTableDataAll(obj) {
     let result = DataUtil.getGridData({
         gridManager: obj.gridManager,
-        isAllData: true
+        isAllData: isAllData
     });
     return result;
 }

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

@@ -42,7 +42,7 @@
             <div class="hg-form-row">
                 <x:inputC name="zepAppliname" required="false"  readonly="true" label="EP流程申请人" labelCol="2" fieldCol="2"/>
                 <x:inputC name="zepFcrdate" wrapper="date"  readonly="true" required="false" label="付款申请创建日期" labelCol="2" fieldCol="2"/>
-                <x:inputC name="zepTxt" required="false" label="付款申请内容" labelCol="2" fieldCol="2"/>
+                <x:inputC name="zepTxt" required="true" label="付款申请内容" labelCol="2" fieldCol="2"/>
             </div>
             <div id="capitalPost">
                 <div class="hg-form-row">

topsun/src/main/java/com/huigou/topsun/sap/costReimbursement/application/impl/SapCostReimbursementApplicationImpl.java

@@ -92,17 +92,18 @@ public class SapCostReimbursementApplicationImpl extends FlowBroker implements S
     @Override
     protected void setTaskDescription(DelegateTask delegateTask) {
         String bizId = delegateTask.getExecution().getProcessBusinessKey();
-        delegateTask.setDescription(this.getApprovalSubjectName(bizId));
+        SapCostReimbursement sapCostReimbursement = this.loadSapCostReimbursementById(bizId);
+        delegateTask.setName(sapCostReimbursement.getZepFtypename());
+        delegateTask.setDescription(this.getApprovalSubjectName(sapCostReimbursement));
     }
 
     /**
      * 获取任务标题
      *
-     * @param bizId
+     * @param sapCostReimbursement
      * @return
      */
-    private String getApprovalSubjectName(String bizId) {
-        SapCostReimbursement sapCostReimbursement = this.loadSapCostReimbursementById(bizId);
+    private String getApprovalSubjectName(SapCostReimbursement sapCostReimbursement ) {
         String fillinDateStr = DateUtil.getDateFormat(sapCostReimbursement.getFillinDate());
         String typeName = sapCostReimbursement.getZepFtypename();
         return String.format("%s-%s(%s)",sapCostReimbursement.getPersonMemberName(),typeName , fillinDateStr);