Merge remote-tracking branch 'origin/master'

zjugis-business/src/main/java/com/zjugis/business/flow/Asset/controller/AssetProcureController.java

@@ -58,6 +58,13 @@ public class AssetProcureController extends BaseController {
         Map<String, Object> map = assetProcureService.getFormParams(flowInstanceId, userId,sqd,type);
         return resultPage(map);
     }
+    @WorkFlow(isReceiveMaterial = true, isReceiveOpinion = true)
+    @ResponseBody
+    @GetMapping("/indexAdd")
+    public String indexAdd(String activityTemplateId, String flowInstanceId, String userId, String sqd, String type) throws Exception {
+        Map<String, Object> map = assetProcureService.getFormParams(flowInstanceId, userId,sqd,type);
+        return resultPage(map);
+    }
     @PostMapping("/update")
     @Operation(summary = "更新固定资产采购")
     public String updateAssetProcure(@Valid @RequestBody AssetProcureUpdateReqVO updateReqVO) {

zjugis-business/src/main/java/com/zjugis/business/flow/contract/event/ContractEvent.java

@@ -331,10 +331,9 @@ public class ContractEvent extends BaseController {
         try {
             if (StringUtils.isNotBlank(flowInstanceId)) {
                 Contract entity = contractService.selectByInstanceId(flowInstanceId);
-                Project project = projectService.selectById(entity.getProjectId());
                 List<Map<String, String>> userMaps = new ArrayList<>();
-                if(StringUtils.isNotBlank(project.getXsryId())){
-                    CommonResult<AdminUserRespDTO> userRes = adminUserApi.getUser(project.getXsryId());
+                if(StringUtils.isNotBlank(entity.getAreaManagerId())){
+                    CommonResult<AdminUserRespDTO> userRes = adminUserApi.getUser(entity.getAreaManagerId());
                     AdminUserRespDTO user = userRes.getCheckedData();
                     CommonResult<DeptRespDTO> deptRes  = deptApi.getDept(user.getDeptId());
                     DeptRespDTO dept = deptRes.getCheckedData();

zjugis-business/src/main/resources/templates/AssetProcure/indexAdd.ftl

@@ -0,0 +1,237 @@
+<@w.workFlow javascripts=['/AssetProcure/js/index.js','/flow/js/formCommon.js','/js/moment.js', '/OwCommon/OwCommon.js']
+  styles=[ '/flow/css/formCommon.css' ,'/timeSelector/TimeSelector.css','/OwCommon/OwCommon.css' ]>
+  <div class="z-position form-boss ow-tabs" name="createReqVO">
+    <div class="z-form-row" style="display: none;">
+      <input type="text" value="${formEntity.instanceId!}" name="createReqVO$instanceId">
+      <input type="text" value="${formEntity.id!}" name="createReqVO$id">
+      <input type="text" value='${detailList!}' id="detailList">
+      <input type="text" value='${assetTypeJSON!}' id="assetTypeJSON">
+      <input type="text" value='${sqd!}' id="sfsqd">
+    </div>
+    <ul class="ow-tab-nav oa_tabBox">
+      <li z-tabindex="0" class="ow-tab-item on" data-name="jbxx">基础信息</li>
+       <#if WORKFLOW.OPINION! !="">
+          <li z-tabindex="1" class="ow-tab-item" data-name="yj">审批意见</li>
+       </#if>
+    </ul>
+    <div class="ow-tab-scroll z-tab-content">
+      <div class="ow-tab-content" name="jbxx">
+      <div class="form-title" style="margin-top: 0px;">
+        <div class="form-icon">
+          <img src="/imgs/titleIcon.png" alt="">
+          <span>基本信息</span>
+        </div>
+        <div class="form-btn">
+        </div>
+      </div>
+      <div class="jbxx-box jbxx-box-flex">
+        <table class="jbxx-table-info">
+          <tr>
+            <td class="th">
+              <div class="form-label">申请人：</div>
+            </td>
+            <td>
+              <div class="form-group">
+                <div class="form-item">
+                  <div class="z-comp-input" name="createReqVO$userNickname">
+                    <input type="text" value="${formEntity.userNickname!}">
+                  </div>
+                </div>
+              </div>
+            </td>
+            <td class="th">
+              <div class="form-label">所在部门：</div>
+            </td>
+            <td>
+              <div class="form-group">
+                <div class="form-item">
+                  <div class="z-comp-input" name="createReqVO$deptName">
+                    <input type="text" value="${formEntity.deptName!}">
+                  </div>
+                </div>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td class="th">
+              <div class="form-label">申请时间：</div>
+            </td>
+            <td>
+              <div class="form-group">
+                <div class="form-item">
+                  <div class="z-comp-date" name="createReqVO$applyTime">
+                    <input type="text" value="${(formEntity.applyTime?date)!}">
+                  </div>
+                </div>
+              </div>
+            </td>
+            <td class="th">
+              <div class="form-label">采购单号：</div>
+            </td>
+            <td>
+              <div class="form-group">
+                <div class="form-item">
+                  <div class="z-comp-input" name="createReqVO$procureNo">
+                    <input type="text" value="${formEntity.procureNo!}">
+                  </div>
+                </div>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td class="th">
+              <div class="form-label">项目：</div>
+            </td>
+            <td colspan="3">
+              <div class="form-group">
+                <div class="form-item btns-form-box">
+                  <input type="hidden" name="createReqVO$projectId" value="${formEntity.projectId!}">
+                  <div class="z-comp-input" name="createReqVO$projectName">
+                    <input type="text" value="${projectName!}">
+                    <div name="selectProject" id="selectProject" style="width: 50px; float: right;">
+                      <div class="btn btn-sm btn-primary">选择</div>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td class="th">
+              <div class="form-label">项目编号：</div>
+            </td>
+            <td>
+              <div class="form-group">
+                <div class="form-item">
+                  <div class="z-comp-input" name="createReqVO$xmbh">
+                    <input type="text" value="${projectXmbh!}">
+                  </div>
+                </div>
+              </div>
+            </td>
+            <td class="th">
+              <div class="form-label">项目责任部门：</div>
+            </td>
+            <td>
+              <div class="form-group">
+                <div class="form-item">
+                  <div class="z-comp-input" name="createReqVO$xmzrbm">
+                    <input type="text" value="${projectZrbm!}">
+                  </div>
+                </div>
+              </div>
+            </td>
+          </tr>
+          <tr id="cgzje">
+            <td class="th">
+              <div class="form-label">采购总金额（元）：</div>
+            </td>
+            <td colspan="3">
+              <div class="form-group">
+                <div class="form-item">
+                  <div class="z-comp-input z-readonly" name="createReqVO$totalAmount">
+                    <input type="text" value="${formEntity.totalAmount!}">
+                  </div>
+                </div>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td class="th">
+              <div class="form-label">采购清单说明：</div>
+            </td>
+            <td colspan="3">
+              <div class="form-group">
+                <div class="form-item" style="margin: 10px 0;">
+                  <div class="z-comp-textarea" name="createReqVO$procureReason">
+                    <textarea>${formEntity.procureReason!}</textarea>
+                  </div>
+                </div>
+              </div>
+            </td>
+          </tr>
+          <#if (glcg!0)==1>
+            <tr>
+              <td class="th">
+                <div class="form-label">关联普通/用款报销：</div>
+              </td>
+              <td colspan="3">
+                <div class="form-group">
+                  <div class="form-item" style="margin: 10px 0;">
+                    <div class="z-comp-textarea" style="height: 40px;">
+                      <div id="glcghtml" style="margin: 10px;cursor: pointer;"></div>
+                    </div>
+                  </div>
+                </div>
+              </td>
+            </tr>
+          </#if>
+        </table>
+      </div>
+      <div id="detailTable">
+      <div class="form-title">
+        <div class="form-icon">
+          <img src="/imgs/titleIcon.png" alt="">
+          <span>单据详情</span>
+        </div>
+        <div class="form-btn">
+          <button id="addData" name="addData">
+            <img src="/imgs/addIcon.png" alt="">
+            <span>新增</span>
+          </button>
+        </div>
+      </div>
+      <div class="qjsjxx-box">
+        <table class="form-table-info">
+          <tr style="height: 37px;">
+            <td style="width: 150px;">采购时间</td>
+            <td style="width: 150px;">资产编号</td>
+            <td style="width: 100px;">资产名称</td>
+            <td style="width: 100px;">资产类型</td>
+            <td style="width: 100px;">资产型号</td>
+            <td style="width: 170px;">保管人</td>
+            <td style="width: 130px;">金额(元)</td>
+<#--            <td>资产配置</td>-->
+            <td style="width: 200px;">备注</td>
+            <td style="width: 100px;">操作</td>
+          </tr>
+          <tbody class="tbody tbodyQjsq">
+          </tbody>
+        </table>
+      </div>
+      </div>
+      </div>
+      <#if WORKFLOW.OPINION! !="">
+        <div class="ow-tab-content" name="yj">
+
+              <div class="form-title">
+                  <div class="form-icon">
+                      <img src="/imgs/titleIcon.png" alt="">
+                      <span>审批意见</span>
+                  </div>
+                  <div class="form-btn">
+                  </div>
+              </div>
+              <div class="qjsjxx-box">
+                  <div class="z-form-wrap" name="opinionsDiv">
+                      <div class="z-form-row"> ${WORKFLOW.OPINION!} </div>
+                  </div>
+              </div>
+        </div>
+      </#if>
+    </div>
+  </div>
+  <script language="javascript" src="/timeSelector/TimeSelector.js"></script>
+  <script language="javascript">
+  ;
+  (function() {})();
+  window.url = '${z_work_flow}'
+  window.glcglist1 = '${glcglist1!}'
+  window.glcglist2 = '${glcglist2!}'
+  </script>
+  <style type="text/css">
+    .qjsjxx-box .form-table-info tr:nth-child(1){
+      height: 63px;
+    }
+  </style>
+</@w.workFlow>