添加公共庫

sample-form-manager-ui/admin/src/pages/software/materials/modal/AddMaterials.vue

@@ -198,6 +198,7 @@ export default {
       this.form.matterName = row.matterName;
       this.form.deptName = row.deptName;
       this.form.deptId = row.deptId;
+      this.form.deptCode = row.deptCode;
       console.log(row);
     },
     // 编辑

sample-form-manager-ui/admin/src/pages/software/materials/modal/PreviewMaterials.vue

@@ -3,7 +3,7 @@
     <el-drawer
       title="材料预览"
       :visible.sync="Visible"
-      size="80%"
+      size="60%"
       @close="handleClose"
     >
       <div class="main flex">
@@ -19,13 +19,13 @@
             <img class="sample-sheet-img" :src="api + materialsPreview" />
           </div>
         </div>
-        <div class="right">
-          <formBuilder
-            ref="formBuilder"
-            :buildData="materialsJsonList"
-            v-model="val"
-          ></formBuilder>
-        </div>
+<!--        <div class="right">-->
+<!--          <formBuilder-->
+<!--            ref="formBuilder"-->
+<!--            :buildData="materialsJsonList"-->
+<!--            v-model="val"-->
+<!--          ></formBuilder>-->
+<!--        </div>-->
       </div>
     </el-drawer>
   </div>

sample-form-manager/src/main/java/com/mortals/xhx/module/matter/service/impl/MatterDatumServiceImpl.java

@@ -69,12 +69,6 @@ public class MatterDatumServiceImpl extends AbstractCRUDServiceImpl<MatterDatumD
 
     @Value("${upload.path}")
     private String filePath;
-    @Value("${upload.url:http://localhost:17215/fsm/file/commonupload?prePath=/file/uploadfile}")
-    private String uploadUrl;
-    @Autowired
-    private UploadService uploadService;
-    @Autowired
-    private ParamService paramService;
     @Autowired
     private MatterService matterService;
 
@@ -113,22 +107,6 @@ public class MatterDatumServiceImpl extends AbstractCRUDServiceImpl<MatterDatumD
         return iRet;
     }
 
-//    @Override
-//    protected void findAfter(MatterDatumEntity params, PageInfo pageInfo, Context context, List<MatterDatumEntity> list) throws AppException {
-//        if (CollectionUtils.isNotEmpty(list)) {
-//            for (MatterDatumEntity entity : list) {
-//                MatterEntity matter = matterService.get(entity.getMatterId());
-//                if (matter != null) {
-//                    entity.setMatterName(matter.getMatterName());
-//                    entity.setMatterNo(matter.getMatterNo());
-//                    entity.setDeptName(matter.getDeptName());
-//                    entity.setDeptCode(matter.getDeptCode());
-//                }
-//
-//            }
-//        }
-//    }
-
     @Override
     protected void saveBefore(MatterDatumEntity entity, Context context) throws AppException {
 
@@ -161,7 +139,6 @@ public class MatterDatumServiceImpl extends AbstractCRUDServiceImpl<MatterDatumD
             throw new AppException("数据已更改,请重试");
         }
         String msg = "推荐成功！";
-
         List<MatterEntity> matterEntities = matterService.find(new MatterQuery().siteId(siteId), context);
         int recommendCount = 0;
         for (MatterEntity matterEntity : matterEntities) {