明细增加必填

zjugis-business/src/main/java/com/zjugis/business/flow/common/event/CommonEvent.java

@@ -115,15 +115,10 @@ public class CommonEvent extends BaseController {
             if (!Objects.isNull(activityInstance) && activityInstance.containsKey("id")) {
                 String flowName = flowInstance.get("name").toString();
                 String flowInstanceId = flowInstance.get("id").toString();
-                String activityInstanceId = activityInstance.get("id").toString();
-                CommonResult<List<IActivityInsParticiPantDto>> parRes = workflowClient.getActivityParticipants(activityInstanceId);
-                List<IActivityInsParticiPantDto> parts = parRes.getCheckedData();
                 CommonResult<IFlowInstance> desc = workflowClient.flowInstance(flowInstanceId);
-                for (int i = 0; i < parts.size(); i++) {
-                    String content = "您的" + flowName + "：["+desc.getCheckedData().getDescribtion()+"]，已经可以打印了，请及时打印并黏贴发票。";
-                    DingMessageDto message = new DingMessageDto(desc.getCheckedData().getCreateWorker(),content);
-                    dingApi.sendMessage(message);
-                }
+                String content = "您的" + flowName + "：["+desc.getCheckedData().getDescribtion()+"]，已经可以打印了，请及时打印并黏贴发票。";
+                DingMessageDto message = new DingMessageDto(desc.getCheckedData().getCreateWorker(),content);
+                dingApi.sendMessage(message);
             }
             return ok("true");
         } catch (Exception e) {

zjugis-business/src/main/resources/templates/AssetProcure/js/agentIndex.js

@@ -232,12 +232,14 @@
         + '</div>'
         + '</td>'
         + '<td>'
+        + '<div style="display: flex;white-space: nowrap;">'
         + '<div id="editBtn_' + (i) + '" class="table-btn editBtn_' + (i) + '" data-index="' + (i) + '">'
         + '<span>保存</span>'
         + '</div>'
         + '<div id="delBtn_' + (i) + '" class="table-btn delBtn_' + (i) + '" data-index="' + (i) + '">'
         + '<span>删除</span>'
         + '</div>'
+        + '</div>'
         + '</td>';
     let trFragment = document.createDocumentFragment();
     trFragment.appendChild(trDom);
@@ -316,6 +318,34 @@
             return;
           }
           if (html === '保存') {
+            if(!$("[name='AssetProcureDetailDO[" + i + "]$projectId']").val()){
+              z.ui.alertWarning(`项目不能为空！`)
+              return false;
+            }
+            if(!z.ui.input("[name='AssetProcureDetailDO[" + i + "]$assetNo']").getValue()){
+              z.ui.alertWarning(`资产编号不能为空！`)
+              return false;
+            }
+            if(!z.ui.input("[name='AssetProcureDetailDO[" + i + "]$assetName']").getValue()){
+              z.ui.alertWarning(`资产名称不能为空！`)
+              return false;
+            }
+            if(!z.ui.input("[name='AssetProcureDetailDO[" + i + "]$assetType']").getValue()){
+              z.ui.alertWarning(`资产类型不能为空！`)
+              return false;
+            }
+            if(!z.ui.input("[name='AssetProcureDetailDO[" + i + "]$assetModel']").getValue()){
+              z.ui.alertWarning(`资产型号不能为空！`)
+              return false;
+            }
+            if(!$("[name='AssetProcureDetailDO[" + i + "]$custodian']").val()){
+              z.ui.alertWarning(`保管人不能为空！`)
+              return false;
+            }
+            if(!z.ui.input("[name='AssetProcureDetailDO[" + i + "]$amount']").getValue()){
+              z.ui.alertWarning(`金额不能为空！`)
+              return false;
+            }
             span.html('编辑')
             detailReadonly(i, false)
             addDataThat.removeAttr('disabled')

zjugis-business/src/main/resources/templates/AssetProcure/js/index.js

@@ -191,12 +191,14 @@
         + '</div>'
         + '</td>'
         + '<td>'
+        + '<div style="display: flex;white-space: nowrap;">'
         + '<div id="editBtn_' + (i) + '" class="table-btn editBtn_' + (i) + '" data-index="' + (i) + '">'
         + '<span>保存</span>'
         + '</div>'
         + '<div id="delBtn_' + (i) + '" class="table-btn delBtn_' + (i) + '" data-index="' + (i) + '">'
         + '<span>删除</span>'
         + '</div>'
+        + '</div>'
         + '</td>';
     let trFragment = document.createDocumentFragment();
     trFragment.appendChild(trDom);
@@ -262,6 +264,34 @@
             return;
           }
           if (html === '保存') {
+            if(!z.ui.date("[name='AssetProcureDetailDO[" + i + "]$procureTime']").getValue()){
+              z.ui.alertWarning(`采购时间不能为空！`)
+              return false;
+            }
+            if(!z.ui.input("[name='AssetProcureDetailDO[" + i + "]$assetNo']").getValue()){
+              z.ui.alertWarning(`资产编号不能为空！`)
+              return false;
+            }
+            if(!z.ui.input("[name='AssetProcureDetailDO[" + i + "]$assetName']").getValue()){
+              z.ui.alertWarning(`资产名称不能为空！`)
+              return false;
+            }
+            if(!z.ui.input("[name='AssetProcureDetailDO[" + i + "]$assetType']").getValue()){
+              z.ui.alertWarning(`资产类型不能为空！`)
+              return false;
+            }
+            if(!z.ui.input("[name='AssetProcureDetailDO[" + i + "]$assetModel']").getValue()){
+              z.ui.alertWarning(`资产型号不能为空！`)
+              return false;
+            }
+            if(!$("[name='AssetProcureDetailDO[" + i + "]$custodian']").val()){
+              z.ui.alertWarning(`保管人不能为空！`)
+              return false;
+            }
+            if(!z.ui.input("[name='AssetProcureDetailDO[" + i + "]$amount']").getValue()){
+              z.ui.alertWarning(`金额不能为空！`)
+              return false;
+            }
             span.html('编辑')
             detailReadonly(i, false)
             addDataThat.removeAttr('disabled')

zjugis-business/src/main/resources/templates/OutsourcePurchase/js/index.js

@@ -159,12 +159,14 @@
         + '</div>'
         + '</td>'
         + '<td>'
+        + '<div style="display: flex;white-space: nowrap;">'
         + '<div id="editBtn_' + (i) + '" class="table-btn editBtn_' + (i) + '" data-index="' + (i) + '">'
         + '<span>保存</span>'
         + '</div>'
         + '<div id="delBtn_' + (i) + '" class="table-btn delBtn_' + (i) + '" data-index="' + (i) + '">'
         + '<span>删除</span>'
         + '</div>'
+        + '</div>'
         + '</td>';
     let trFragment = document.createDocumentFragment();
     trFragment.appendChild(trDom);
@@ -213,6 +215,30 @@
         return;
       }
       if (html === '保存') {
+        if(!z.ui.date("[name='OutsourcePurchaseDet[" + i + "]$purchaseTime']").getValue()){
+          z.ui.alertWarning(`采购时间不能为空！`)
+          return false;
+        }
+        if(!z.ui.input("[name='OutsourcePurchaseDet[" + i + "]$assetType']").getValue()){
+          z.ui.alertWarning(`外购存货类型不能为空！`)
+          return false;
+        }
+        if(!z.ui.input("[name='OutsourcePurchaseDet[" + i + "]$assetName']").getValue()){
+          z.ui.alertWarning(`外购存货名称不能为空！`)
+          return false;
+        }
+        if(!z.ui.input("[name='OutsourcePurchaseDet[" + i + "]$assetModel']").getValue()){
+          z.ui.alertWarning(`外购存货型号不能为空！`)
+          return false;
+        }
+        if(!z.ui.input("[name='OutsourcePurchaseDet[" + i + "]$totalAmount']").getValue()){
+          z.ui.alertWarning(`总金额不能为空！`)
+          return false;
+        }
+        if(!z.ui.input("[name='OutsourcePurchaseDet[" + i + "]$purchaseCount']").getValue()){
+          z.ui.alertWarning(`采购数量不能为空！`)
+          return false;
+        }
         span.html('编辑')
         detailReadonly(i, false)
         addDataThat.removeAttr('disabled')

zjugis-business/src/main/resources/templates/UseMoney/js/agentIndex.js

@@ -142,12 +142,14 @@
         + '</div>'
         + '</td>'
         + '<td>'
+        + '<div style="display: flex;white-space: nowrap;">'
         + '<div id="editBtn_' + (i) + '" class="table-btn editBtn_' + (i) + '" data-index="' + (i) + '">'
         + '<span>保存</span>'
         + '</div>'
         + '<div id="delBtn_' + (i) + '" class="table-btn delBtn_' + (i) + '" data-index="' + (i) + '">'
         + '<span>删除</span>'
         + '</div>'
+        + '</div>'
         + '</td>';
     let trFragment = document.createDocumentFragment();
     trFragment.appendChild(trDom);
@@ -203,6 +205,26 @@
         return;
       }
       if (html === '保存') {
+        if(!$("[name='UserMoneyDetailDO[" + i + "]$costType']").val()){
+          z.ui.alertWarning(`实际所属类型不能为空！`)
+          return false;
+        }
+        if(!$("[name='UserMoneyDetailDO[" + i + "]$projectId']").val()){
+          z.ui.alertWarning(`项目不能为空！`)
+          return false;
+        }
+        if(!z.ui.input("[name='UserMoneyDetailDO[" + i + "]$costContent']").getValue()){
+          z.ui.alertWarning(`用途不能为空！`)
+          return false;
+        }
+        if(!z.ui.input("[name='UserMoneyDetailDO[" + i + "]$invoiceNums']").getValue()){
+          z.ui.alertWarning(`单据张数不能为空！`)
+          return false;
+        }
+        if(!z.ui.input("[name='UserMoneyDetailDO[" + i + "]$amount']").getValue()){
+          z.ui.alertWarning(`金额不能为空！`)
+          return false;
+        }
         span.html('编辑')
         detailReadonly(i, false)
         addDataThat.removeAttr('disabled')

zjugis-business/src/main/resources/templates/UseMoney/js/index.js

@@ -116,12 +116,14 @@
         + '</div>'
         + '</td>'
         + '<td>'
+        + '<div style="display: flex;white-space: nowrap;">'
         + '<div id="editBtn_' + (i) + '" class="table-btn editBtn_' + (i) + '" data-index="' + (i) + '">'
         + '<span>保存</span>'
         + '</div>'
         + '<div id="delBtn_' + (i) + '" class="table-btn delBtn_' + (i) + '" data-index="' + (i) + '">'
         + '<span>删除</span>'
         + '</div>'
+        + '</div>'
         + '</td>';
     let trFragment = document.createDocumentFragment();
     trFragment.appendChild(trDom);
@@ -165,6 +167,22 @@
         return;
       }
       if (html === '保存') {
+        if(!$("[name='UserMoneyDetailDO[" + i + "]$costType']").val()){
+          z.ui.alertWarning(`实际所属类型不能为空！`)
+          return false;
+        }
+        if(!z.ui.input("[name='UserMoneyDetailDO[" + i + "]$costContent']").getValue()){
+          z.ui.alertWarning(`用途不能为空！`)
+          return false;
+        }
+        if(!z.ui.input("[name='UserMoneyDetailDO[" + i + "]$invoiceNums']").getValue()){
+          z.ui.alertWarning(`单据张数不能为空！`)
+          return false;
+        }
+        if(!z.ui.input("[name='UserMoneyDetailDO[" + i + "]$amount']").getValue()){
+          z.ui.alertWarning(`金额不能为空！`)
+          return false;
+        }
         span.html('编辑')
         detailReadonly(i, false)
         addDataThat.removeAttr('disabled')