普通报销和差旅报销增加项目责任部门和项目编号

zjugis-business/src/main/java/com/zjugis/business/flow/commoncost/service/CommonCostServiceImpl.java

@@ -194,7 +194,7 @@ public class CommonCostServiceImpl implements CommonCostService {
         detailRespVOS.forEach(x -> {
             if (StringUtils.isNotBlank(x.getProjectId())) {
                 Project project = projectService.selectById(x.getProjectId());
-                x.setProjectName(project.getXmmc());
+                x.setProjectName(project.getXmmc()+"("+ project.getXmbh() +")");
                 x.setProjectDeptName(deptApi.getDept(project.getZrbmId()).getCheckedData().getName());
             }
         });

zjugis-business/src/main/java/com/zjugis/business/flow/travelcost/service/TravelCostServiceImpl.java

@@ -190,7 +190,8 @@ public class TravelCostServiceImpl implements TravelCostService {
             Project project = projectService.selectById(entity.getProjectId());
             map.put("projectName", project.getXmmc());
             map.put("projectXmbh", project.getXmbh());
-            map.put("projectZrbm", project.getZrbm());
+            DeptRespDTO dept = deptApi.getDept(project.getZrbmId()).getCheckedData();
+            map.put("projectZrbm", dept.getName());
         }
         List<TravelCostOtherDO> otherList = travelCostOtherService.getListByTravelCostId(entity.getId());
         List<TravelCostBoatCarDO> boatCarList = travelCostBoatCarService.getListByTravelCostId(entity.getId());

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

@@ -434,7 +434,7 @@
     function setProject(res) {
         if (res.data) {
             $("[name='CommonCostDetailDO[" + detailProjectIndex + "]$projectId']").val(res.data.id);
-            z.ui.input("[name='CommonCostDetailDO[" + detailProjectIndex + "]$projectName']").setValue(res.data.xmmc);
+            z.ui.input("[name='CommonCostDetailDO[" + detailProjectIndex + "]$projectName']").setValue((res.data.xmmc+"("+ res.data.xmbh +")"));
             z.ui.input("[name='CommonCostDetailDO[" + detailProjectIndex + "]$xmzrbm']").setValue(res.data.zrbm);
         }
     }

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

@@ -427,7 +427,7 @@
     function setProject(res) {
         if (res.data) {
             $("[name='CommonCostDetailDO[" + detailProjectIndex + "]$projectId']").val(res.data.id);
-            z.ui.input("[name='CommonCostDetailDO[" + detailProjectIndex + "]$projectName']").setValue(res.data.xmmc);
+            z.ui.input("[name='CommonCostDetailDO[" + detailProjectIndex + "]$projectName']").setValue((res.data.xmmc+"("+ res.data.xmbh +")"));
             z.ui.input("[name='CommonCostDetailDO[" + detailProjectIndex + "]$xmzrbm']").setValue(res.data.zrbm);
         }
     }

zjugis-business/src/main/resources/templates/TravelCost/index.ftl

@@ -141,6 +141,32 @@
                 </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 z-readonly" name="projectXmbh">
+                      <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 z-readonly" name="projectZrbm">
+                      <input type="text" value="${projectZrbm!}">
+                    </div>
+                  </div>
+                </div>
+              </td>
+            </tr>
             <tr>
               <td class="th">
                 <div class="form-label">付款单位：</div>

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

@@ -922,6 +922,8 @@
         if (res.data) {
             $("[name='createReqVO$projectId']").val(res.data.id);
             z.ui.input("[name='createReqVO$projectName']").setValue(res.data.xmmc);
+            z.ui.input("[name='projectXmbh']").setValue(res.data.xmbh);
+            z.ui.input("[name='projectZrbm']").setValue(res.data.zrbm);
         }
     }