diff --git a/shandan-bianmu/src/main/java/com/keyware/shandan/bianmu/controller/MetadataController.java b/shandan-bianmu/src/main/java/com/keyware/shandan/bianmu/controller/MetadataController.java
index 3c4aae5..6d5edf1 100644
--- a/shandan-bianmu/src/main/java/com/keyware/shandan/bianmu/controller/MetadataController.java
+++ b/shandan-bianmu/src/main/java/com/keyware/shandan/bianmu/controller/MetadataController.java
@@ -13,6 +13,7 @@ import com.keyware.shandan.common.entity.Result;
 import com.keyware.shandan.common.enums.SecretLevel;
 import com.keyware.shandan.common.util.StreamUtil;
 import com.keyware.shandan.common.util.StringUtils;
+import com.keyware.shandan.system.constants.FormTypeEnum;
 import com.keyware.shandan.system.entity.SysFile;
 import com.keyware.shandan.system.entity.SysFormConfig;
 import com.keyware.shandan.system.service.SysFileService;
@@ -98,9 +99,7 @@ public class MetadataController extends BaseController<MetadataService, Metadata
     public ModelAndView edit(ModelAndView mav) {
         mav.setViewName("business/metadata/metadataEdit");
         mav.addObject("LabelConfigSet", labelsService.formConfigList());
-        QueryWrapper<SysFormConfig> query = new QueryWrapper<>();
-        query.eq("FORM_TYPE", 1);
-        mav.addObject("metadataFormConfig", formConfigService.list(query));
+        mav.addObject("metadataFormConfig", formConfigService.listByFormType(FormTypeEnum.metadataEditForm));
         return mav;
     }
 
diff --git a/shandan-bianmu/src/main/resources/view/business/metadata/metadataEdit.html b/shandan-bianmu/src/main/resources/view/business/metadata/metadataEdit.html
index 4170d31..56c57cb 100644
--- a/shandan-bianmu/src/main/resources/view/business/metadata/metadataEdit.html
+++ b/shandan-bianmu/src/main/resources/view/business/metadata/metadataEdit.html
@@ -54,49 +54,6 @@
                                  th:id="${'dict-'+field.fieldName}"></div>
                         </div>
                     </div>
-                    <!--<div class="layui-form-item">
-                        <label class="layui-form-label">数据名称</label>
-                        <div class="layui-input-block">
-                            <input type="hidden" name="metadataComment">
-                            <input type="text" name="metadataName" autocomplete="off" placeholder="数据名称"
-                                   class="layui-input" lay-verify="required" readonly>
-                        </div>
-                    </div>
-                    <div class="layui-form-item">
-                        <label class="layui-form-label">任务时间</label>
-                        <div class="layui-input-block">
-                            <input type="text" id="collectionTime" name="collectionTime" placeholder="任务时间"
-                                   class="layui-input" lay-verify="required">
-                        </div>
-                    </div>
-                    <div class="layui-form-item">
-                        <label class="layui-form-label">数据来源</label>
-                        <div class="layui-input-block">
-                            <div dict-component="select" dict-type="data_source" dict-name="dataFrom"
-                                 id="dict-data-form"></div>
-                        </div>
-                    </div>
-                    <div class="layui-form-item">
-                        <label class="layui-form-label">数据类型</label>
-                        <div class="layui-input-block">
-                            <div dict-component="select" dict-type="data_type" dict-name="dataType"
-                                 id="dict-data-type"></div>
-                        </div>
-                    </div>
-                    <div class="layui-form-item">
-                        <label class="layui-form-label">数据密级</label>
-                        <div class="layui-input-block">
-                            <div dict-component="radio" dict-type="secret_level" dict-name="secretLevel"
-                                 id="dict-secret-level"></div>
-                        </div>
-                    </div>
-                    <div class="layui-form-item">
-                        <label class="layui-form-label">主题任务</label>
-                        <div class="layui-input-block">
-                            <input type="text" name="themeTask" autocomplete="off" placeholder="主题任务"
-                                   class="layui-input">
-                        </div>
-                    </div>-->
                     <div class="layui-form-item" th:each="labelSet, iterState:${LabelConfigSet}">
                         <label class="layui-form-label" th:text="${labelSet.fieldTitle}">标签类型</label>
                         <div class="layui-input-block label-set-component"
diff --git a/shandan-common/src/main/resources/static/css/common/common.css b/shandan-common/src/main/resources/static/css/common/common.css
index d35164b..747ca97 100644
--- a/shandan-common/src/main/resources/static/css/common/common.css
+++ b/shandan-common/src/main/resources/static/css/common/common.css
@@ -290,4 +290,17 @@ fieldset a, fieldset a:hover{
     position: absolute;
     top: 0;
     font-size: 20px;
+}
+.dynamic-form{
+    display: flex;
+    max-width: 100%;
+    flex-flow: wrap;
+}
+.dynamic-form .layui-form-item{
+    width: calc(50% - 20px);
+    margin-left: 10px;
+}
+.dynamic-form .layui-input-block{
+    margin-left: 0;
+    flex: 1;
 }
\ No newline at end of file
diff --git a/shandan-system/src/main/java/com/keyware/shandan/bianmu/controller/MetadataCommonController.java b/shandan-system/src/main/java/com/keyware/shandan/bianmu/controller/MetadataCommonController.java
index 3a9294a..c8cf862 100644
--- a/shandan-system/src/main/java/com/keyware/shandan/bianmu/controller/MetadataCommonController.java
+++ b/shandan-system/src/main/java/com/keyware/shandan/bianmu/controller/MetadataCommonController.java
@@ -13,6 +13,7 @@ import com.keyware.shandan.common.util.StringUtils;
 import com.keyware.shandan.datasource.entity.DBTableColumnVo;
 import com.keyware.shandan.datasource.entity.DataSourceVo;
 import com.keyware.shandan.datasource.service.DataSourceService;
+import com.keyware.shandan.system.constants.FormTypeEnum;
 import com.keyware.shandan.system.entity.SysFormConfig;
 import com.keyware.shandan.system.service.SysFormConfigService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -81,9 +82,7 @@ public class MetadataCommonController {
 
         mav.addObject("LabelConfigSet", labelsService.formConfigList());
 
-        QueryWrapper<SysFormConfig> query = new QueryWrapper<>();
-        query.eq("FORM_TYPE", 1);
-        mav.addObject("metadataFormConfig", formConfigService.list(query));
+        mav.addObject("metadataFormConfig", formConfigService.listByFormType(FormTypeEnum.metadataEditForm));
         return mav;
     }
 
diff --git a/shandan-system/src/main/java/com/keyware/shandan/mark/controller/MarkViewController.java b/shandan-system/src/main/java/com/keyware/shandan/mark/controller/MarkViewController.java
index 19cba39..0f1d607 100644
--- a/shandan-system/src/main/java/com/keyware/shandan/mark/controller/MarkViewController.java
+++ b/shandan-system/src/main/java/com/keyware/shandan/mark/controller/MarkViewController.java
@@ -1,6 +1,6 @@
 package com.keyware.shandan.mark.controller;
 
-import com.keyware.shandan.mark.constant.FormTypeEnum;
+import com.keyware.shandan.system.constants.FormTypeEnum;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
diff --git a/shandan-system/src/main/java/com/keyware/shandan/mark/services/MarkService.java b/shandan-system/src/main/java/com/keyware/shandan/mark/services/MarkService.java
index b99b51a..b8fa53f 100644
--- a/shandan-system/src/main/java/com/keyware/shandan/mark/services/MarkService.java
+++ b/shandan-system/src/main/java/com/keyware/shandan/mark/services/MarkService.java
@@ -1,7 +1,7 @@
 package com.keyware.shandan.mark.services;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.keyware.shandan.mark.constant.FormTypeEnum;
+import com.keyware.shandan.system.constants.FormTypeEnum;
 import com.keyware.shandan.mark.pojo.FormMark;
 import com.keyware.shandan.mark.pojo.MarkRecord;
 import com.keyware.shandan.mark.pojo.MarkType;
diff --git a/shandan-system/src/main/java/com/keyware/shandan/mark/constant/FormTypeEnum.java b/shandan-system/src/main/java/com/keyware/shandan/system/constants/FormTypeEnum.java
similarity index 72%
rename from shandan-system/src/main/java/com/keyware/shandan/mark/constant/FormTypeEnum.java
rename to shandan-system/src/main/java/com/keyware/shandan/system/constants/FormTypeEnum.java
index 66e1b51..bb0cf37 100644
--- a/shandan-system/src/main/java/com/keyware/shandan/mark/constant/FormTypeEnum.java
+++ b/shandan-system/src/main/java/com/keyware/shandan/system/constants/FormTypeEnum.java
@@ -1,5 +1,6 @@
-package com.keyware.shandan.mark.constant;
+package com.keyware.shandan.system.constants;
 
+import com.baomidou.mybatisplus.annotation.EnumValue;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
@@ -16,16 +17,19 @@ public enum FormTypeEnum {
     /**
      * 数据资源注册表单
      */
-    metadataEditForm("数据资源注册表单"),
+    metadataEditForm(1,"数据资源注册表单"),
     /**
      * 文件上传表单
      */
-    fileUploadForm("文件上传表单"),
+    fileUploadForm(2, "文件上传表单"),
     /**
      * 文件夹上传表单
      */
     @Deprecated
-    dirUploadForm("文件夹上传表单");
+    dirUploadForm(3, "文件夹上传表单");
+
+    @EnumValue
+    private final Integer value;
 
     /**
      * 描述
diff --git a/shandan-system/src/main/java/com/keyware/shandan/system/controller/SysFileController.java b/shandan-system/src/main/java/com/keyware/shandan/system/controller/SysFileController.java
index f60521e..547b942 100644
--- a/shandan-system/src/main/java/com/keyware/shandan/system/controller/SysFileController.java
+++ b/shandan-system/src/main/java/com/keyware/shandan/system/controller/SysFileController.java
@@ -8,10 +8,12 @@ import com.keyware.shandan.common.controller.BaseController;
 import com.keyware.shandan.common.entity.Result;
 import com.keyware.shandan.common.util.FileDownload;
 import com.keyware.shandan.frame.properties.CustomProperties;
+import com.keyware.shandan.system.constants.FormTypeEnum;
 import com.keyware.shandan.system.entity.SysFile;
 import com.keyware.shandan.system.entity.SysFileChunk;
 import com.keyware.shandan.system.entity.SysSetting;
 import com.keyware.shandan.system.service.SysFileService;
+import com.keyware.shandan.system.service.SysFormConfigService;
 import com.keyware.shandan.system.service.SysSettingService;
 import com.keyware.shandan.system.utils.FileChunkUploadUtil;
 import org.apache.tomcat.util.http.ResponseUtil;
@@ -57,12 +59,16 @@ public class SysFileController extends BaseController<SysFileService, SysFile, S
 
     @Autowired
     private DataLabelsService labelsService;
+    @Autowired
+    private SysFormConfigService formConfigService;
 
 
     @GetMapping("/layer")
     public ModelAndView fileUploadLayer(ModelAndView mav) {
         mav.setViewName("sys/file/fileUploadLayer");
         mav.addObject("LabelConfigSet", labelsService.formConfigList());
+
+        mav.addObject("uploadFormConfig", formConfigService.listByFormType(FormTypeEnum.fileUploadForm));
         return mav;
     }
 
diff --git a/shandan-system/src/main/java/com/keyware/shandan/system/service/SysFormConfigService.java b/shandan-system/src/main/java/com/keyware/shandan/system/service/SysFormConfigService.java
index db31c26..f946f45 100644
--- a/shandan-system/src/main/java/com/keyware/shandan/system/service/SysFormConfigService.java
+++ b/shandan-system/src/main/java/com/keyware/shandan/system/service/SysFormConfigService.java
@@ -1,8 +1,11 @@
 package com.keyware.shandan.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.keyware.shandan.system.constants.FormTypeEnum;
 import com.keyware.shandan.system.entity.SysFormConfig;
 
+import java.util.List;
+
 /**
  * 系统表单配置服务接口类
  *
@@ -10,4 +13,6 @@ import com.keyware.shandan.system.entity.SysFormConfig;
  * @date 2023/8/23
  */
 public interface SysFormConfigService extends IService<SysFormConfig> {
+
+    List<SysFormConfig> listByFormType(FormTypeEnum formTypeEnum);
 }
diff --git a/shandan-system/src/main/java/com/keyware/shandan/system/service/impl/SysFormConfigServiceImpl.java b/shandan-system/src/main/java/com/keyware/shandan/system/service/impl/SysFormConfigServiceImpl.java
index e5a851f..a1bef17 100644
--- a/shandan-system/src/main/java/com/keyware/shandan/system/service/impl/SysFormConfigServiceImpl.java
+++ b/shandan-system/src/main/java/com/keyware/shandan/system/service/impl/SysFormConfigServiceImpl.java
@@ -1,11 +1,15 @@
 package com.keyware.shandan.system.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.keyware.shandan.system.constants.FormTypeEnum;
 import com.keyware.shandan.system.entity.SysFormConfig;
 import com.keyware.shandan.system.mapper.SysFormConfigMapper;
 import com.keyware.shandan.system.service.SysFormConfigService;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * 系统表单配置服务实现类
  *
@@ -14,4 +18,10 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class SysFormConfigServiceImpl extends ServiceImpl<SysFormConfigMapper, SysFormConfig> implements SysFormConfigService {
+    @Override
+    public List<SysFormConfig> listByFormType(FormTypeEnum formTypeEnum) {
+        QueryWrapper<SysFormConfig> query = new QueryWrapper<>();
+        query.eq("FORM_TYPE", formTypeEnum.getValue());
+        return list(query);
+    }
 }
diff --git a/shandan-system/src/main/resources/static/js/sys/file/dirUpload.js b/shandan-system/src/main/resources/static/js/sys/file/dirUpload.js
index 35db2bf..dfc5396 100644
--- a/shandan-system/src/main/resources/static/js/sys/file/dirUpload.js
+++ b/shandan-system/src/main/resources/static/js/sys/file/dirUpload.js
@@ -129,7 +129,7 @@ layui.use(['layer', 'uploader', 'element', 'form', 'laydate', 'dict', 'datalabel
     function bindDatetimePlugins() {
         //日期选择器
         laydate.render({
-            elem: '#input-data',
+            elem: 'input[name="inputDate"]',
             format: "yyyy-MM-dd HH:mm:ss",
             type: 'datetime',
             value: new Date(),
diff --git a/shandan-system/src/main/resources/view/sys/file/dirUploadLayer.html b/shandan-system/src/main/resources/view/sys/file/dirUploadLayer.html
index e83768e..ea35db8 100644
--- a/shandan-system/src/main/resources/view/sys/file/dirUploadLayer.html
+++ b/shandan-system/src/main/resources/view/sys/file/dirUploadLayer.html
@@ -49,7 +49,11 @@
             background-color: #FFF;
             border-top: 1px solid #eee;
         }
-        .star-mark{color: red; display: none}
+
+        .star-mark {
+            color: red;
+            display: none
+        }
 
     </style>
 </head>
@@ -60,109 +64,50 @@
         <div style="overflow: hidden; flex: 1">
             <div class="layui-upload" id="uploader-table"></div>
         </div>
-        <div class="layui-form" lay-filter="file-form"
-             style="border: 1px solid #eee; padding-top:15px; margin-bottom: 50px;">
-            <div class="layui-form-item">
-                <div class="layui-inline">
-                    <label class="layui-form-label"><span style="color: red">*</span>文件密级</label>
-                    <div class="layui-input-inline">
-                        <div dict-component="select" dict-type="secret_level" dict-name="secretLevel"
-                             dict-width="100%" id="dict-secret-level"></div>
-                    </div>
-                </div>
-                <div class="layui-inline">
-                    <label class="layui-form-label">是否演训数据</label>
-                    <div class="layui-input-inline">
-                        <input class="layui-input" type="radio" name="exerciseData" value="0" title="否" checked  lay-filter="exerciseData"/>
-                        <input class="layui-input" type="radio" name="exerciseData" value="1" title="是" lay-filter="exerciseData"/>
-                    </div>
-                </div>
-            </div>
-            <div class="layui-form-item">
-                <div class="layui-inline">
-                    <label class="layui-form-label"><span class="star-mark">*</span>任务时间</label>
-                    <div class="layui-input-inline">
-                        <input class="layui-input" id="input-data" name="inputDate" type="text">
-                    </div>
-                </div>
-                <div class="layui-inline">
-                    <label class="layui-form-label">录入人员</label>
-                    <div class="layui-input-inline" th:object="${@securityUtil.getLoginSysUser()}">
-                        <input class="layui-input" name="entryStaff" type="text" readonly
-                               th:value="*{userName}">
-                    </div>
-                </div>
-            </div>
-            <div class="layui-form-item">
-                <div class="layui-inline">
-                    <label class="layui-form-label"><span class="star-mark">*</span>文件来源</label>
-                    <div class="layui-input-inline">
-                        <div dict-component="select" dict-type="data_source" dict-name="source"
-                             dict-width="100%" id="dict-data-form"></div>
-                    </div>
-                </div>
-                <div class="layui-inline">
-                    <label class="layui-form-label">目标/靶标类型</label>
-                    <div class="layui-input-inline">
-                        <div dict-component="select" dict-type="target_type" dict-name="targetNumber"
-                             dict-width="100%" id="dict-target-type"></div>
-                    </div>
-                </div>
-            </div>
-            <div class="layui-form-item">
-                <div class="layui-inline">
-                    <label class="layui-form-label"><span class="star-mark">*</span>任务代号</label>
-                    <div class="layui-input-inline">
-                        <div dict-component="select" dict-type="task_code" dict-name="taskCode"
-                             dict-width="100%" id="dict-task-code"></div>
-                    </div>
-                </div>
-                <div class="layui-inline">
-                    <label class="layui-form-label"><span class="star-mark">*</span>任务性质</label>
-                    <div class="layui-input-inline">
-                        <div dict-component="select" dict-type="task_nature" dict-name="taskNature"
-                             dict-width="100%" id="dict-task-nature"></div>
-                    </div>
-                </div>
-            </div>
-            <div class="layui-form-item">
-                <div class="layui-inline">
-                    <label class="layui-form-label"><span class="star-mark">*</span>部队代号</label>
-                    <div class="layui-input-inline">
-                        <div dict-component="select" dict-type="troop_code" dict-name="troopCode"
-                             dict-width="100%" id="dict-troop-code"></div>
-                    </div>
-                </div>
-                <div class="layui-inline">
-                    <label class="layui-form-label"><span class="star-mark">*</span>装备型号</label>
-                    <div class="layui-input-inline">
-                        <div dict-component="select" dict-type="equipment_model" dict-name="equipmentModel"
-                             dict-width="100%" id="dict-equipment-model"></div>
-                    </div>
-                </div>
-            </div>
-            <div class="layui-form-item">
-                <div class="layui-inline">
-                    <label class="layui-form-label">导弹编号</label>
-                    <div class="layui-input-inline">
-                        <div dict-component="select" dict-type="missile_number" dict-name="missileNumber"
-                             dict-width="100%" id="dict-missile-number"></div>
-                    </div>
-                </div>
-                <div class="layui-inline">
-                    <label class="layui-form-label">主题任务</label>
-                    <div class="layui-input-inline">
-                        <input class="layui-input" name="themeTask" type="text">
-                    </div>
-                </div>
-            </div>
-            <div class="layui-form-item layui-form-text">
-                <label class="layui-form-label" style="margin-left: -10px;">文件描述</label>
-                <div class="layui-input-block" style="width:calc(100% - 130px);margin-left: 0">
-                    <textarea class="layui-textarea" name="remark"></textarea>
+        <div class="layui-form dynamic-form" lay-filter="file-form"
+             style="border: 1px solid #eee; padding-top:15px; margin-bottom: 50px;" th:object="${@securityUtil.getLoginSysUser()}">
+            <div class="layui-form-item"
+                 th:each="field,iterStat : ${uploadFormConfig}"
+                 th:if="${field.isShow}"
+                 th:style="${field.fieldType == 'textarea' ? 'width: calc(100% - 30px);' : ''}"
+                th:with="username=*{userName}">
+                <label class="layui-form-label" th:text="${field.showTitle}">字段名称</label>
+                <div class="layui-input-block">
+                    <!-- 文本框类型 -->
+                    <input class="layui-input" type="text" autocomplete="off"
+                           th:if="${field.fieldType == 'input' || field.fieldType == 'date'}"
+                           th:name="${field.fieldName}"
+                           th:value="${field.fieldName=='entryStaff'?username:''}"
+                           th:disabled="${field.isDisabled}"
+                           th:placeholder="${field.showTitle}"
+                           th:lay-verify="${field.isRequired ? 'required' : ''}">
+                    <!-- 文本域类型 -->
+                    <textarea class="layui-textarea" type="text" autocomplete="off"
+                              th:if="${field.fieldType == 'textarea'}"
+                              th:name="${field.fieldName}"
+                              th:disabled="${field.isDisabled}"
+                              th:placeholder="${field.showTitle}"
+                              th:lay-verify="${field.isRequired ? 'required' : ''}"></textarea>
+                    <th:block th:if="${field.fieldType == 'radio' && field.isShow}">
+                        <input class="layui-inline" type="radio"
+                               th:each="exp, stat : ${#strings.listSplit(field.dictType, ';')}"
+                               th:with="tmp=${#strings.arraySplit(exp, '-')}, value=${tmp[0]}, title=${tmp[1]}, checked=${#arrays.length(tmp)==3?tmp[2]:false}"
+                               th:name="${field.fieldName}"
+                               th:value="${value}"
+                               th:title="${title}"
+                               th:checked="${checked}"
+                        />
+                    </th:block>
+                    <!-- 数据字典类型 -->
+                    <div dict-component="select"
+                         th:if="${field.fieldType == 'dict'}"
+                         th:disabled="${field.isDisabled}"
+                         th:dict-type="${field.dictType}"
+                         th:dict-name="${field.fieldName}"
+                         th:id="${'dict-'+field.fieldName}"></div>
                 </div>
             </div>
-            <div class="layui-form-item" th:each="labelSet, iterState:${LabelConfigSet}">
+            <div class="layui-form-item" th:each="labelSet, iterState:${LabelConfigSet}" style="width: 100%">
                 <label class="layui-form-label" th:text="${labelSet.fieldTitle}">标签类型</label>
                 <div class="layui-input-block label-set-component"
                      th:data-id="${labelSet.id}"