2024-08-01 1、付款单逻辑调整先审核再核销 2、新增选择公司回写公司名称

src/main/java/com/baosight/hggp/hg/cw/service/ServiceHGCW016.java

@@ -283,7 +283,7 @@ public class ServiceHGCW016 extends ServiceBase {
                 hgcw016.fromMap(resultRows.get(i));
                 hgcw016.setCancelStatus(2);
                 if (hgcw016.getReviewStatus() == 0){
-                    throw new Exception("请先审核！");
+                    throw new PlatException("请先审核！");
                 }
                 DaoUtils.update("HGCW016.writeoff", hgcw016);
             }

src/main/webapp/HG/CW/HGCW016.js

 
 $(function() {
+    var companyCodeBox = __eiInfo.getBlock("roleCompany").getMappedRows();
 
     // 查询
     $("#QUERY").on("click", function () {
@@ -26,7 +27,19 @@ $(function() {
                 defaultValue: function () {
                     return currShortDate();
                 }
+            },
+            {
+                field: "companyCode",
+                template: function (dataItem) {
+                    for (let i = 0; i < companyCodeBox.length; i++) {
+                        if (companyCodeBox[i]['companyCode'] === dataItem['companyCode']) {
+                            dataItem["companyName"] = companyCodeBox[i]['companyName'];
+                            return companyCodeBox[i]['companyName'];
+                        }
                     }
+                    return dataItem["companyCode"];
+                }
+            },
         ],
         loadComplete: function (grid) {
             $("#BTN_CHOICE").on("click",choiceFunc);
@@ -177,11 +190,11 @@ function submitFunc() {
     }
     var flag = true;
     rows.forEach(function (row) {
-        if (row.cancelStatus == "1") {
+       /* if (row.cancelStatus == "1") {
             message("勾选的数据中有未核销的单据！");
             flag = false;
             return;
-        }
+        }*/
         if (row.reviewStatus == "3") {
             message("勾选的数据中有已经提交的单据！");
             flag = false;

src/main/webapp/HG/CW/HGCW016.jsp

@@ -37,6 +37,7 @@
                               align="center" filter="contains" sort="true">
                 <EF:EFOptions blockId="roleCompany" textField="companyName" valueField="companyCode"/>
             </EF:EFComboColumn>
+            <EF:EFColumn ename="companyName" cname="公司名称" hidden="true"/>
             <EF:EFComboColumn ename="partyA" cname="供应商名称" width="120" align="left" defaultValue=""
                               filter="contains" readonly="true">
                 <EF:EFOptions blockId="sup_record_block_id"
@@ -54,7 +55,7 @@
                               columnTemplate="#=textField#" itemTemplate="#=textField#" enable="false" defaultValue="1">
                 <EF:EFCodeOption codeName="hggp.cw.cancelStatus"/>
             </EF:EFComboColumn>
-            <EF:EFComboColumn ename="reviewStatus" cname="审批状态" width="100" align="center" readonly="true"
+            <EF:EFComboColumn ename="reviewStatus" cname="审核状态" width="100" align="center" readonly="true"
                               columnTemplate="#=textField#" itemTemplate="#=textField#" enable="false" defaultValue="0">
                 <EF:EFCodeOption codeName="hggp.cw.reviewStatus"/>
             </EF:EFComboColumn>