diff --git a/src/components/JMultipleDatePicker.vue b/src/components/JMultipleDatePicker.vue
index abe4fcae..40b07d6d 100644
--- a/src/components/JMultipleDatePicker.vue
+++ b/src/components/JMultipleDatePicker.vue
@@ -113,7 +113,7 @@ export default {
 
 // 设置日期面板中选中日期的样式
 .blue {
-  background: #bae7ff !important;
+  background: #ffd5d3 !important;
 }
 
 // 设置输入框中的文字显示
diff --git a/src/components/customField/AddForm.vue b/src/components/customField/AddForm.vue
index 8ce4ff4a..712a12cd 100644
--- a/src/components/customField/AddForm.vue
+++ b/src/components/customField/AddForm.vue
@@ -1,233 +1,213 @@
 <template>
   <a-form-model :model="formInline" v-if="isFormInline" class="form-add" :rules="rules" ref="ruleForm">
     <div v-for="(val,index) in dataList" :key="index">
-      <div v-for="(ol, index) in Object.keys(val)" :key="index">
-        <div class="header-text">
-          &nbsp;{{ol}}
+      <div v-if="val && val.length > 0" class="header-text">{{ index }}</div>
+      <a-row v-if="val && val.length > 0" :gutter="24">
+        <div v-for="(item, index) in val" :key="index">
+          <!--   1, 日期单选  -->
+          <a-col :span="12" v-if="item.fieldShowType === FieldType.DATE_SINGLE.value">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="required" v-if="item.fieldMustInput === '1'">*</span>
+                <span class="title-text-text" :title="item.dbFieldTxt">{{item.dbFieldTxt}}</span>
+              </div>
+              <a-form-model-item class="item-model" :prop="item.dbFieldName">
+                <a-date-picker class="box-input"
+                               :placeholder="$t('pleaseSelect')+item.dbFieldTxt"
+                               :getCalendarContainer="(trigger) => trigger.parentNode"
+                               format="YYYY-MM-DD"
+                               value-format="YYYY-MM-DD"
+                               v-model="formInline[item.dbFieldName]"
+                               :disabled="disabled"
+                               style="width: 100%"/>
+              </a-form-model-item>
+            </div>
+          </a-col>
+          <!--   2, 单选用户  -->
+          <a-col :span="12" v-if="item.fieldShowType === FieldType.USER_SINGLE.value">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="required" v-if="item.fieldMustInput === '1'">*</span>
+                <span class="title-text-text" :title="item.dbFieldTxt">{{item.dbFieldTxt}}</span>
+              </div>
+              <a-form-model-item class="item-model" :prop="item.dbFieldName">
+                <user-or-organ-selection :placeholder="$t('pleaseSelect')+item.dbFieldTxt"
+                                         v-model="formInline[item.dbFieldName]"
+                                         type="radio"
+                                         selectType="user"
+                                         :disabled="disabled"/>
+              </a-form-model-item>
+            </div>
+          </a-col>
+          <!--   3, 单选组织机构  -->
+          <a-col :span="12" v-if="item.fieldShowType === FieldType.ORGAN_SINGLE.value">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="required" v-if="item.fieldMustInput === '1'">*</span>
+                <span class="title-text-text" :title="item.dbFieldTxt">{{item.dbFieldTxt}}</span>
+              </div>
+              <a-form-model-item class="item-model" :prop="item.dbFieldName">
+                <user-or-organ-selection :placeholder="$t('pleaseSelect')+item.dbFieldTxt"
+                                         v-model="formInline[item.dbFieldName]"
+                                         selectType="organ"
+                                         type="radio"
+                                         :disabled="disabled"/>
+              </a-form-model-item>
+            </div>
+          </a-col>
+          <!--   4, 日期多选  -->
+          <a-col :span="12" v-else-if="item.fieldShowType === FieldType.DATE_MORE.value">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="required" v-if="item.fieldMustInput === '1'">*</span>
+                <span class="title-text-text" :title="item.dbFieldTxt">{{item.dbFieldTxt}}</span>
+              </div>
+              <a-form-model-item class="item-model" :prop="item.dbFieldName">
+                <j-multiple-date-picker class="box-input" v-model="formInline[item.dbFieldName]"
+                                        :disabled="disabled"/>
+              </a-form-model-item>
+            </div>
+          </a-col>
+          <!--   5, 多行文本  -->
+          <a-col :span="24" v-else-if="item.fieldShowType === FieldType.TEXTAREA.value">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="required" v-if="item.fieldMustInput === '1'">*</span>
+                <span class="title-text-text" :title="item.dbFieldTxt">{{item.dbFieldTxt}}</span>
+              </div>
+              <a-form-model-item class="item-model-textarea" :prop="item.dbFieldName">
+                <a-textarea
+                  :placeholder="$t('pleaseEnter')+item.dbFieldTxt"
+                  :disabled="disabled"
+                  :maxLength="500"
+                  v-model="formInline[item.dbFieldName]" :rows="4"/>
+              </a-form-model-item>
+            </div>
+          </a-col>
+          <!--   6, 标准多选  -->
+          <a-col :span="24" v-else-if="item.fieldShowType === FieldType.STANDARD_MORE.value">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="required" v-if="item.fieldMustInput === '1'">*</span>
+                <span class="title-text-text" :title="item.dbFieldTxt">{{item.dbFieldTxt}}</span>
+              </div>
+              <a-form-model-item class="item-model" :prop="item.dbFieldName">
+                <standard-selection :query="item"
+                                    :disabled="disabled"
+                                    :standard="formInline"
+                                    @change="standardSelectionChange"
+                                    v-model="formInline[item.dbFieldName]"/>
+              </a-form-model-item>
+            </div>
+          </a-col>
+          <!--   7, 多选组织机构  -->
+          <a-col :span="12" v-if="item.fieldShowType === FieldType.ORGAN_MORE.value">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="required" v-if="item.fieldMustInput === '1'">*</span>
+                <span class="title-text-text" :title="item.dbFieldTxt">{{item.dbFieldTxt}}</span>
+              </div>
+              <a-form-model-item class="item-model" :prop="item.dbFieldName">
+                <user-or-organ-selection :placeholder="$t('pleaseSelect')+item.dbFieldTxt"
+                                         v-model="formInline[item.dbFieldName]"
+                                         selectType="organ"
+                                         type="checkbox"
+                                         :disabled="disabled"/>
+              </a-form-model-item>
+            </div>
+          </a-col>
+          <!--   8, 上传文件  -->
+          <a-col :span="12" v-else-if="item.fieldShowType === FieldType.FILE_UP.value">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="required" v-if="item.fieldMustInput === '1'">*</span>
+                <span class="title-text-text" :title="item.dbFieldTxt">{{item.dbFieldTxt}}</span>
+              </div>
+              <a-form-model-item class="item-model" :prop="item.dbFieldName">
+                <a-button type="primary" class="button-text"
+                          @click="clickButtonToUpload(item)">
+                  {{
+                    (formInline[item.dbFieldName] === 'null' || formInline[item.dbFieldName] === ''
+                      || formInline[item.dbFieldName] === null || formInline[item.dbFieldName] === undefined)
+                      ? $t('uploadFile.clickUpload')
+                      : $t('uploadFile.viewUploadedFiles')
+                  }}
+                </a-button>
+              </a-form-model-item>
+            </div>
+          </a-col>
+          <!--   9, 文本框  -->
+          <a-col :span="12" v-else-if="item.fieldShowType === FieldType.TEXT_BOX.value">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="required" v-if="item.fieldMustInput === '1'">*</span>
+                <span class="title-text-text" :title="item.dbFieldTxt">{{item.dbFieldTxt}}</span>
+              </div>
+              <a-form-model-item class="item-model" :prop="item.dbFieldName">
+                <a-input class="box-input"
+                         :disabled="disabled"
+                         v-model="formInline[item.dbFieldName]"
+                         :maxLength="50"
+                         :placeholder="$t('pleaseEnter')+item.dbFieldTxt"/>
+              </a-form-model-item>
+            </div>
+          </a-col>
+          <!--   10, 下拉单选  -->
+          <a-col :span="12" v-else-if="item.fieldShowType === FieldType.OPTION_SINGLE.value">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="required" v-if="item.fieldMustInput === '1'">*</span>
+                <span class="title-text-text" :title="item.dbFieldTxt">{{item.dbFieldTxt}}</span>
+              </div>
+              <a-form-model-item class="item-model" :prop="item.dbFieldName">
+                <j-dict-select-tag class="box-input" v-model="formInline[item.dbFieldName]"
+                                   :disabled="disabled"
+                                   :placeholder="$t('pleaseSelect')+item.dbFieldTxt"
+                                   :type="'select'"
+                                   :triggerChange="false" :dictCode="item.dict_field"/>
+              </a-form-model-item>
+            </div>
+          </a-col>
+          <!--   11, 下拉多选  -->
+          <a-col :span="12" v-else-if="item.fieldShowType === FieldType.OPTION_MORE.value">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="required" v-if="item.fieldMustInput === '1'">*</span>
+                <span class="title-text-text" :title="item.dbFieldTxt">{{item.dbFieldTxt}}</span>
+              </div>
+              <a-form-model-item class="item-model" :prop="item.dbFieldName">
+                <j-multi-select-tag class="box-input" v-model="formInline[item.dbFieldName]"
+                                    :disabled="disabled"
+                                    :placeholder="$t('pleaseSelect')+item.dbFieldTxt"
+                                    :type="'select'"
+                                    :triggerChange="false" :dictCode="item.dict_field"/>
+              </a-form-model-item>
+            </div>
+          </a-col>
+          <!--   树选择       -->
+<!--          <a-col :span="12" v-else-if="item.fieldShowType === FieldType.TREE.value">-->
+<!--            <div class="box-title-text" :title="item.dbFieldTxt">-->
+<!--              <div class="title-text">-->
+<!--                <span class="required" v-if="item.fieldMustInput === '1'">*</span>-->
+<!--                <span class="title-text-text">{{item.dbFieldTxt}}</span>-->
+<!--              </div>-->
+<!--              <a-form-model-item class="item-model" :prop="item.dbFieldName">-->
+<!--                <a-tree-select-->
+<!--                  tree-node-filter-prop="title"-->
+<!--                  v-model="formInline[item.dbFieldName]"-->
+<!--                  :maxTagCount="1"-->
+<!--                  :getPopupContainer="triggerNode=> triggerNode.parentNode"-->
+<!--                  style="width: 100%"-->
+<!--                  :tree-data="item.tree"-->
+<!--                  tree-checkable-->
+<!--                  :placeholder="$t('PleaseSelect')+item.dbFieldTxt"-->
+<!--                />-->
+<!--              </a-form-model-item>-->
+<!--            </div>-->
+<!--          </a-col>-->
+
         </div>
-        <a-row :gutter="24">
-          <div v-for="(item, index) in val[ol]" :key="index">
-            <a-col :span="12" v-if="item.field_show_type === FieldType.TEXT_STRING.value || item.field_show_type === FieldType.TEXT_LINK.value">
-              <div class="box-title-text">
-                <div class="title-text">
-                  <span class="required" v-if="item.field_must_input === 1">*</span>
-                  <span class="title-text-text" :title="item.db_field_txt">{{item.db_field_txt}}</span>
-                </div>
-                <a-form-model-item class="item-model" :prop="item.db_field_name">
-                  <a-input class="box-input"
-                           :disabled="disabled"
-                           v-model="formInline[item.db_field_name]"
-                           :maxLength="50"
-                           :placeholder="$t('pleaseEnter')+item.db_field_txt"/>
-                </a-form-model-item>
-              </div>
-            </a-col>
-
-            <a-col :span="12" v-else-if="item.field_show_type === FieldType.TEXT_NUMBER.value">
-              <div class="box-title-text">
-                <div class="title-text">
-                  <span class="required" v-if="item.field_must_input === 1">*</span>
-                  <span class="title-text-text" :title="item.db_field_txt">{{item.db_field_txt}}</span>
-                </div>
-                <a-form-model-item class="item-model" :prop="item.db_field_name">
-                  <a-input-number class="box-input"
-                                  :placeholder="$t('pleaseEnter')+item.db_field_txt"
-                                  :disabled="disabled"
-                                  v-model="formInline[item.db_field_name]" :min="1" :max="99999999"/>
-                </a-form-model-item>
-              </div>
-            </a-col>
-
-            <a-col :span="12" v-else-if="item.field_show_type === FieldType.PULL_SINGLE.value">
-              <div class="box-title-text">
-                <div class="title-text">
-                  <span class="required" v-if="item.field_must_input === 1">*</span>
-                  <span class="title-text-text" :title="item.db_field_txt">{{item.db_field_txt}}</span>
-                </div>
-                <a-form-model-item class="item-model" :prop="item.db_field_name">
-                  <j-dict-select-tag class="box-input" v-model="formInline[item.db_field_name]"
-                                     :disabled="disabled"
-                                     @input="handleInput(item.db_field_name)"
-                                     :placeholder="$t('pleaseSelect')+item.db_field_txt"
-                                     :type="'select'"
-                                     :triggerChange="false" :dictCode="item.dict_field"/>
-                </a-form-model-item>
-              </div>
-            </a-col>
-
-            <a-col :span="12" v-else-if="item.field_show_type === FieldType.PULL_MORE.value">
-              <div class="box-title-text">
-                <div class="title-text">
-                  <span class="required" v-if="item.field_must_input === 1">*</span>
-                  <span class="title-text-text" :title="item.db_field_txt">{{item.db_field_txt}}</span>
-                </div>
-                <a-form-model-item class="item-model-multi" :prop="item.db_field_name">
-                  <j-multi-select-tag class="box-input" v-model="formInline[item.db_field_name]"
-                                      :disabled="disabled"
-                                      :placeholder="$t('pleaseSelect')+item.db_field_txt"
-                                      :type="'select'"
-                                      :triggerChange="false" :dictCode="item.dict_field"/>
-                </a-form-model-item>
-              </div>
-            </a-col>
-            <a-col :span="12" v-else-if="item.field_show_type === FieldType.DATE_SINGLE.value">
-              <div class="box-title-text">
-                <div class="title-text">
-                  <span class="required" v-if="item.field_must_input === 1">*</span>
-                  <span class="title-text-text" :title="item.db_field_txt">{{item.db_field_txt}}</span>
-                </div>
-                <a-form-model-item class="item-model" :prop="item.db_field_name">
-                  <a-date-picker class="box-input"
-                                 :placeholder="$t('pleaseSelect')+item.db_field_txt"
-                                 @change="dateChange(item)"
-                                 :getCalendarContainer="(trigger) => trigger.parentNode"
-                                 format="YYYY-MM-DD"
-                                 v-model="formInline[item.db_field_name]"
-                                 :disabled="disabled"
-                                 style="width: 100%"/>
-                  <!--                      :disabledDate="disabledDate"-->
-                </a-form-model-item>
-              </div>
-            </a-col>
-            <a-col :span="12" v-else-if="item.field_show_type === FieldType.DATE_MORE.value">
-              <div class="box-title-text">
-                <div class="title-text">
-                  <span class="required" v-if="item.field_must_input === 1">*</span>
-                  <span class="title-text-text" :title="item.db_field_txt">{{item.db_field_txt}}</span>
-                </div>
-                <a-form-model-item class="item-model" :prop="item.db_field_name">
-                  <a-range-picker class="box-input" v-model="formInline[item.db_field_name]"
-                                  :disabled="disabled"
-                                  :getCalendarContainer="(trigger) => trigger.parentNode"
-                                  @change="onChange(item.db_field_name)"></a-range-picker>
-                </a-form-model-item>
-              </div>
-            </a-col>
-
-            <a-col :span="12" v-else-if="item.field_show_type === FieldType.FILE.value">
-              <div class="box-title-text">
-                <div class="title-text">
-                  <span class="required" v-if="item.field_must_input === 1">*</span>
-                  <span class="title-text-text" :title="item.db_field_txt">{{item.db_field_txt}}</span>
-                </div>
-                <a-form-model-item class="item-model" :prop="item.db_field_name">
-                  <a-button type="primary" class="button-text"
-                            @click="clickButtonToUpload(item)">
-                    {{
-                      (formInline[item.db_field_name] === 'null' || formInline[item.db_field_name] === ''
-                        || formInline[item.db_field_name] === null || formInline[item.db_field_name] === undefined)
-                        ? $t('uploadFile.clickUpload')
-                        : $t('uploadFile.viewUploadedFiles')
-                    }}
-                  </a-button>
-                </a-form-model-item>
-              </div>
-            </a-col>
-
-            <a-col :span="24" v-else-if="item.field_show_type === FieldType.TEXT.value || item.field_show_type === 'text'">
-              <div class="box-title-text">
-                <div class="title-text">
-                  <span class="required" v-if="item.field_must_input === 1">*</span>
-                  <span class="title-text-text" :title="item.db_field_txt">{{item.db_field_txt}}</span>
-                </div>
-                <a-form-model-item class="item-model-textarea" :prop="item.db_field_name">
-                  <a-textarea
-                    :placeholder="$t('pleaseEnter')+item.db_field_txt"
-                    :disabled="disabled"
-                    :maxLength="500"
-                    v-model="formInline[item.db_field_name]" :rows="4"/>
-                </a-form-model-item>
-              </div>
-            </a-col>
-
-            <a-col :span="24" v-else-if="item.field_show_type === FieldType.PERSON.value || item.field_show_type == 'sel_user'">
-              <div class="box-title-text">
-                <div class="title-text">
-                  <span class="required" v-if="item.field_must_input === 1">*</span>
-                  <span class="title-text-text" :title="item.db_field_txt">{{item.db_field_txt}}</span>
-                </div>
-                <a-form-model-item class="item-model" :prop="item.db_field_name">
-                  <personnel-selection :query="item"
-                                      v-if="isFormInline"
-                                      :personneQuery="formInline"
-                                      @change="personnelSelectionChange"
-                                      :disabled="disabled"
-                                      v-model="formInline[item.db_field_name]"/>
-                </a-form-model-item>
-              </div>
-            </a-col>
-
-            <a-col :span="24" v-else-if="item.field_show_type === FieldType.STANDARD.value">
-              <div class="box-title-text">
-                <div class="title-text">
-                  <span class="required" v-if="item.field_must_input === 1">*</span>
-                  <span class="title-text-text" :title="item.db_field_txt">{{item.db_field_txt}}</span>
-                </div>
-                <a-form-model-item class="item-model" :prop="item.db_field_name">
-                  <standard-selection :query="item"
-                                     :disabled="disabled"
-                                     :standard="formInline"
-                                     @change="standardSelectionChange"
-                                     v-model="formInline[item.db_field_name]"/>
-                </a-form-model-item>
-              </div>
-            </a-col>
-
-            <a-col :span="12" v-else-if="item.field_show_type === 'RADIO'">
-              <div class="box-title-text">
-                <div class="title-text">
-                  <span class="required" v-if="item.field_must_input === 1">*</span>
-                  <span class="title-text-text" :title="item.db_field_txt">{{item.db_field_txt}}</span>
-                </div>
-                <a-form-model-item class="item-model" :prop="item.db_field_name">
-                  <j-dict-select-tag v-model="formInline[item.db_field_name]"
-                                     :disabled="disabled"
-                                     @input="handleInput(item.db_field_name)"
-                                     :placeholder="$t('selectStatus')"
-                                     :type="'radio'" :triggerChange="false" :dictCode="item.dict_field"/>
-                </a-form-model-item>
-              </div>
-            </a-col>
-
-            <a-col :span="12" v-else-if="item.field_show_type === FieldType.TREE.value">
-              <div class="box-title-text" :title="item.db_field_txt">
-                <div class="title-text">
-                  <span class="required" v-if="item.field_must_input === 1">*</span>
-                  <span class="title-text-text">{{item.db_field_txt}}</span>
-                </div>
-                <a-form-model-item class="item-model" :prop="item.db_field_name">
-                  <a-tree-select
-                    tree-node-filter-prop="title"
-                    v-model="formInline[item.db_field_name]"
-                    :maxTagCount="1"
-                    :getPopupContainer="triggerNode=> triggerNode.parentNode"
-                    style="width: 100%"
-                    :tree-data="item.tree"
-                    tree-checkable
-                    :placeholder="$t('PleaseSelect')+item.db_field_txt"
-                  />
-                </a-form-model-item>
-              </div>
-            </a-col>
-
-            <a-col :span="12" v-else-if="item.field_show_type === 'CHECKBOX'">
-              <div class="box-title-text">
-                <div class="title-text">
-                  <span class="required" v-if="item.field_must_input === 1">*</span>
-                  <span class="title-text-text" :title="item.db_field_txt">{{item.db_field_txt}}</span>
-                </div>
-                <a-form-model-item class="item-model-multi" :prop="item.db_field_name">
-                  <j-multi-select-tag class="box-input" v-model="formInline[item.db_field_name]"
-                                      :disabled="disabled"
-                                      :placeholder="$t('selectStatus')" :type="'checkbox'"
-                                      :triggerChange="false" :dictCode="item.dict_field"/>
-                </a-form-model-item>
-              </div>
-            </a-col>
-
-          </div>
-        </a-row>
-      </div>
+      </a-row>
     </div>
     <upload-file ref="uploadFile" @change="uploadFileChange" :return-url="false"></upload-file>
   </a-form-model>
@@ -240,11 +220,14 @@ import JMultiSelectTag from '../dict/JMultiSelectTag'
 import UploadFile from '../UploadFile'
 // 选择标准选择器
 import StandardSelection from '../selection/StandardSelection'
+// 选择用户或组织机构
+import UserOrOrganSelection from '../selection/UserOrOrganSelection'
 import { FieldType } from '../../enums/commonEnums'
+import JMultipleDatePicker from '../JMultipleDatePicker'
 
 export default {
   name: 'AddForm',
-  components: { StandardSelection, JDictSelectTag, JMultiSelectTag, UploadFile },
+  components: { JMultipleDatePicker, StandardSelection, JDictSelectTag, JMultiSelectTag, UploadFile, UserOrOrganSelection },
   props: {
     url: {
       type: Object,
@@ -285,81 +268,81 @@ export default {
     add () {
       this.formInline = {}
       this.type = 'add'
-      // this.getForm()
-      this.dataList = [
-        {
-          基本信息: [
-            {
-              area: '基本信息',
-              db_field_name: 'serial_number',
-              db_field_txt: '编号',
-              db_length: 200,
-              dict_field: '',
-              field_must_input: '1',
-              field_show_type: '1',
-              tree: []
-            },
-            {
-              area: '基本信息',
-              db_field_name: 'state',
-              db_field_txt: '状态',
-              db_length: 36,
-              dict_field: 'state',
-              field_must_input: '1',
-              field_show_type: '3',
-              tree: []
-            },
-            {
-              area: '基本信息',
-              db_field_name: 'standard_system',
-              db_field_txt: '标准体系',
-              db_length: 100,
-              dict_field: 'standard_system',
-              field_must_input: '0',
-              field_show_type: '3',
-              tree: []
-            },
-            {
-              area: '基本信息',
-              db_field_name: 'corresponding_standard',
-              db_field_txt: '对应标准',
-              db_length: 200,
-              dict_field: '',
-              field_must_input: '0',
-              field_show_type: '10',
-              tree: []
-            }
-          ]
-        },
-        {
-          文本信息: [
-            {
-              area: '文本信息',
-              db_field_name: 'release_draft',
-              db_field_txt: '发言稿（必读）',
-              db_length: 3000,
-              dict_field: '',
-              field_must_input: '0',
-              field_show_type: '7',
-              flag: 1,
-              tree: []
-            },
-            {
-              area: '文本信息',
-              db_field_name: 'release_draft',
-              db_field_txt: '发言稿（必读）',
-              db_length: 3000,
-              dict_field: '',
-              field_must_input: '0',
-              field_show_type: '7',
-              flag: 1,
-              tree: []
-            }
-          ]
-        }
-      ]
-      this.ruleList = this.dataList
-      this.integrateData()
+      this.getForm()
+      // this.dataList = [
+      //   {
+      //     基本信息: [
+      //       {
+      //         area: '基本信息',
+      //         dbFieldName: 'serial_number',
+      //         dbFieldTxt: '编号',
+      //         db_length: 200,
+      //         dict_field: '',
+      //         fieldMustInput: '1',
+      //         fieldShowType: '1',
+      //         tree: []
+      //       },
+      //       {
+      //         area: '基本信息',
+      //         dbFieldName: 'state',
+      //         dbFieldTxt: '状态',
+      //         db_length: 36,
+      //         dict_field: 'state',
+      //         fieldMustInput: '1',
+      //         fieldShowType: '3',
+      //         tree: []
+      //       },
+      //       {
+      //         area: '基本信息',
+      //         dbFieldName: 'standard_system',
+      //         dbFieldTxt: '标准体系',
+      //         db_length: 100,
+      //         dict_field: 'standard_system',
+      //         fieldMustInput: '0',
+      //         fieldShowType: '3',
+      //         tree: []
+      //       },
+      //       {
+      //         area: '基本信息',
+      //         dbFieldName: 'corresponding_standard',
+      //         dbFieldTxt: '对应标准',
+      //         db_length: 200,
+      //         dict_field: '',
+      //         fieldMustInput: '0',
+      //         fieldShowType: '10',
+      //         tree: []
+      //       }
+      //     ]
+      //   },
+      //   {
+      //     文本信息: [
+      //       {
+      //         area: '文本信息',
+      //         dbFieldName: 'release_draft',
+      //         dbFieldTxt: '发言稿（必读）',
+      //         db_length: 3000,
+      //         dict_field: '',
+      //         fieldMustInput: '0',
+      //         fieldShowType: '7',
+      //         flag: 1,
+      //         tree: []
+      //       },
+      //       {
+      //         area: '文本信息',
+      //         dbFieldName: 'release_draft',
+      //         dbFieldTxt: '发言稿（必读）',
+      //         db_length: 3000,
+      //         dict_field: '',
+      //         fieldMustInput: '0',
+      //         fieldShowType: '7',
+      //         flag: 1,
+      //         tree: []
+      //       }
+      //     ]
+      //   }
+      // ]
+      // this.ruleList = this.dataList
+      // this.integrateData()
     },
     edit (item) {
       this.type = 'edit'
@@ -379,7 +362,7 @@ export default {
     getForm (callBack) {
       this.confirmLoading = true
       const params = {
-        flag: this.flag,
+        module: this.flag,
         type: this.type
       }
       getAction(this.url.getAddForm, params).then((res) => {
@@ -395,61 +378,52 @@ export default {
     integrateData () {
       this.isFormInline = false
       const ruleList = []
-      this.ruleList.forEach(res => {
-        Object.keys(res).forEach(val => {
-          res[val].forEach(ol => {
-            ruleList.push(ol)
-          })
+      console.log(this.ruleList)
+      for (const item in this.ruleList) {
+        this.ruleList[item].forEach(ol => {
+          ruleList.push(ol)
         })
-      })
+      }
       const rules = {}
       ruleList.forEach((res, index) => {
         const rule = []
-        if (res.field_must_input === 1) {
-          if (res.field_show_type === '1') {
+        if (res.fieldMustInput === '1') {
+          if (res.fieldShowType === '1') {
             rule.push({
               required: true,
-              message: res.db_field_txt + this.$t('cannotEmpty'),
+              message: res.dbFieldTxt + this.$t('cannotEmpty'),
               trigger: 'blur'
             })
-          } else if (res.field_show_type === '4' || res.field_show_type === '6' ||
-            res.field_show_type === '5' || res.field_show_type === '7'
+          } else if (res.fieldShowType === '4' || res.fieldShowType === '6' ||
+            res.fieldShowType === '5' || res.fieldShowType === '7'
           ) {
             rule.push({
               required: true,
-              message: res.db_field_txt + this.$t('cannotEmpty'),
+              message: res.dbFieldTxt + this.$t('cannotEmpty'),
               trigger: 'change'
             })
-          } else if (res.field_show_type === '2') {
+          } else if (res.fieldShowType === '2') {
             rule.push({
               required: true,
-              message: res.db_field_txt + this.$t('cannotEmpty'),
+              message: res.dbFieldTxt + this.$t('cannotEmpty'),
               trigger: 'blur'
             })
-          } else if (res.field_show_type === '8' || res.field_show_type === '9' || res.field_show_type === '10' || res.field_show_type === '11') {
+          } else if (res.fieldShowType === '8' || res.fieldShowType === '9' || res.fieldShowType === '10' || res.fieldShowType === '11') {
             rule.push({
               required: true,
-              message: res.db_field_txt + this.$t('cannotEmpty'),
+              message: res.dbFieldTxt + this.$t('cannotEmpty'),
               trigger: 'blur'
             })
-          } else if (res.field_show_type === '3') {
+          } else if (res.fieldShowType === '3') {
             rule.push({
               required: true,
-              message: res.db_field_txt + this.$t('cannotEmpty'),
+              message: res.dbFieldTxt + this.$t('cannotEmpty'),
               trigger: 'change'
             })
           }
         }
-        if (res.field_show_type === '1' || res.field_show_type === '8' || res.field_show_type === '9' ||
-          res.field_show_type === '10' || res.field_show_type === '11') {
-          rule.push({
-            max: res.db_length,
-            message: res.db_field_txt + this.$t('cannotExceed') + res.db_length + this.$t('characters'),
-            trigger: 'blur'
-          })
-        }
         if (rule.length > 0) {
-          rules[res.db_field_name] = rule
+          rules[res.dbFieldName] = rule
         }
       })
       this.rules = rules
@@ -458,8 +432,8 @@ export default {
     },
     // 点击点击上传按钮
     clickButtonToUpload (item) {
-      this.$refs.uploadFile.open(this.formInline[item.db_field_name])
-      this.uploadName = item.db_field_name
+      this.$refs.uploadFile.open(this.formInline[item.dbFieldName])
+      this.uploadName = item.dbFieldName
     },
     // 文件上传改变后的回调
     uploadFileChange (data) {
@@ -478,11 +452,6 @@ export default {
       this.formInline[value + '_id'] = id
       this.formInline = { ...this.formInline }
     },
-    // 人员选择变化
-    personnelSelectionChange (value, id) {
-      this.formInline[value + '_id'] = id
-      this.formInline = { ...this.formInline }
-    },
     submit () {
       this.$refs.ruleForm.validate(valid => {
         if (valid) {
diff --git a/src/components/customField/Search.vue b/src/components/customField/Search.vue
index 23262afe..5c5a33e1 100644
--- a/src/components/customField/Search.vue
+++ b/src/components/customField/Search.vue
@@ -4,57 +4,58 @@
       <a-col :md="(24 / (minLength + 1))" :sm="(24 / minLength)" v-for="(item,index) in searchList" :key="index" style="line-height: 48px">
         <template v-if="index < minLength">
           <!-- 树形选择器 -->
-          <template v-if="item.field_show_type === FieldType.TREE.value">
-            <a-form-item :label="item.db_field_txt" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-tree-select
-                tree-node-filter-prop="title"
-                v-model="queryParam[item.db_field_name]"
-                :maxTagCount="1"
-                :getPopupContainer="triggerNode=> triggerNode.parentNode"
-                :tree-data="item.tree"
-                tree-checkable
-                :placeholder="$t('pleaseSelect')+item.db_field_txt"
-              />
-            </a-form-item>
-          </template>
+<!--          <template v-if="item.fieldShowType === FieldType.TREE.value">-->
+<!--            <a-form-item :label="item.dbFieldTxt" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
+<!--              <a-tree-select-->
+<!--                tree-node-filter-prop="title"-->
+<!--                v-model="queryParam[item.dbFieldName]"-->
+<!--                :maxTagCount="1"-->
+<!--                :getPopupContainer="triggerNode=> triggerNode.parentNode"-->
+<!--                :tree-data="item.tree"-->
+<!--                tree-checkable-->
+<!--                :placeholder="$t('pleaseSelect')+item.dbFieldTxt"-->
+<!--              />-->
+<!--            </a-form-item>-->
+<!--          </template>-->
           <!--  输入框 -->
           <template
-               v-else-if="[FieldType.TEXT_STRING.value, FieldType.TEXT.value,FieldType.PERSON.value,
-                FieldType.STANDARD.value, FieldType.TEXT_LINK.value].includes(item.field_show_type)">
-            <a-form-item :label="item.db_field_txt" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input :placeholder="$t('pleaseEnter')+item.db_field_txt"
-                       v-model="queryParam[item.db_field_name]"></a-input>
+               v-if="[FieldType.TEXT_BOX.value, FieldType.TEXTAREA.value,FieldType.USER_SINGLE.value,
+                FieldType.ORGAN_SINGLE.value, FieldType.STANDARD_MORE.value, FieldType.ORGAN_MORE.value]
+                .includes(item.fieldShowType)">
+            <a-form-item :label="item.dbFieldTxt" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input :placeholder="$t('pleaseEnter')+item.dbFieldTxt"
+                       v-model="queryParam[item.dbFieldName]"></a-input>
             </a-form-item>
           </template>
           <!--   数字输入框  -->
-          <template v-else-if="item.field_show_type === FieldType.TEXT_NUMBER.value">
-            <a-form-item :label="item.db_field_txt" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input-number :placeholder="$t('pleaseEnter')+item.db_field_txt"
-                              v-model="queryParam[item.db_field_name]" :min="1" :max="99999999"/>
-            </a-form-item>
-          </template>
+<!--          <template v-else-if="item.fieldShowType === FieldType.TEXT_NUMBER.value">-->
+<!--            <a-form-item :label="item.dbFieldTxt" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
+<!--              <a-input-number :placeholder="$t('pleaseEnter')+item.dbFieldTxt"-->
+<!--                              v-model="queryParam[item.dbFieldName]" :min="1" :max="99999999"/>-->
+<!--            </a-form-item>-->
+<!--          </template>-->
           <!--   字典多选框  -->
-          <template v-else-if="item.field_show_type === FieldType.PULL_MORE.value">
-            <a-form-item :label="item.db_field_txt" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-multi-select-tag v-model="queryParam[item.db_field_name]"
-                                  :placeholder="$t('pleaseSelect')+item.db_field_txt" :type="'select'"
-                                  :triggerChange="false" :dictCode="item.dict_field"/>
-            </a-form-item>
-          </template>
+<!--          <template v-else-if="item.fieldShowType === FieldType.OPTION_SINGLE.value">-->
+<!--            <a-form-item :label="item.dbFieldTxt" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
+<!--              <j-multi-select-tag v-model="queryParam[item.dbFieldName]"-->
+<!--                                  :placeholder="$t('pleaseSelect')+item.dbFieldTxt" :type="'select'"-->
+<!--                                  :triggerChange="false" :dictCode="item.dict_field"/>-->
+<!--            </a-form-item>-->
+<!--          </template>-->
           <!--   日期区间  -->
-          <template v-else-if="[FieldType.DATE_SINGLE.value, FieldType.DATE_MORE.value].includes(item.field_show_type)">
-            <a-form-item :label="item.db_field_txt" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-range-picker v-model="queryParam[item.db_field_name]"
-                              :placeholder="$t('pleaseSelect')+item.db_field_txt"
+          <template v-else-if="[FieldType.DATE_SINGLE.value, FieldType.DATE_MORE.value].includes(item.fieldShowType)">
+            <a-form-item :label="item.dbFieldTxt" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-range-picker v-model="queryParam[item.dbFieldName]"
+                              :placeholder="$t('pleaseSelect')+item.dbFieldTxt"
                               format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-                              @change="onChange(item.db_field_name)"></a-range-picker>
+                              @change="onChange(item.dbFieldName)"></a-range-picker>
             </a-form-item>
           </template>
           <!--  字典单选框  -->
-          <template v-else-if="item.field_show_type === FieldType.PULL_SINGLE.value">
-            <a-form-item :label="item.db_field_txt" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-dict-select-tag v-model="queryParam[item.db_field_name]"
-                                 :placeholder="$t('pleaseSelect')+item.db_field_txt"
+          <template v-else-if="item.fieldShowType === FieldType.OPTION_SINGLE.value || item.fieldShowType === FieldType.OPTION_MORE.value">
+            <a-form-item :label="item.dbFieldTxt" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <j-dict-select-tag v-model="queryParam[item.dbFieldName]"
+                                 :placeholder="$t('pleaseSelect')+item.dbFieldTxt"
                                  :type="'select'"
                                  :triggerChange="false" :dictCode="item.dict_field"/>
             </a-form-item>
@@ -63,55 +64,56 @@
 
         <template v-if="index >= minLength && toggleSearchStatus">
           <!--   树形选择器   -->
-          <template v-if="item.field_show_type === FieldType.TREE.value">
-            <a-form-item :label="item.db_field_txt" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-tree-select
-                tree-node-filter-prop="title"
-                v-model="queryParam[item.db_field_name]"
-                :maxTagCount="1"
-                :getPopupContainer="triggerNode=> triggerNode.parentNode"
-                :tree-data="item.tree"
-                tree-checkable
-                :placeholder="$t('pleaseSelect')+item.db_field_txt"
-              />
-            </a-form-item>
-          </template>
+<!--          <template v-if="item.fieldShowType === FieldType.TREE.value">-->
+<!--            <a-form-item :label="item.dbFieldTxt" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
+<!--              <a-tree-select-->
+<!--                tree-node-filter-prop="title"-->
+<!--                v-model="queryParam[item.dbFieldName]"-->
+<!--                :maxTagCount="1"-->
+<!--                :getPopupContainer="triggerNode=> triggerNode.parentNode"-->
+<!--                :tree-data="item.tree"-->
+<!--                tree-checkable-->
+<!--                :placeholder="$t('pleaseSelect')+item.dbFieldTxt"-->
+<!--              />-->
+<!--            </a-form-item>-->
+<!--          </template>-->
           <!--   输入框  -->
-          <template v-else-if="[FieldType.TEXT_STRING.value, FieldType.TEXT.value,FieldType.PERSON.value,
-                FieldType.STANDARD.value, FieldType.TEXT_LINK.value].includes(item.field_show_type)">
-            <a-form-item :label="item.db_field_txt" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input :placeholder="$t('pleaseEnter')+item.db_field_txt"
-                       v-model="queryParam[item.db_field_name]"></a-input>
+          <template v-if="[FieldType.TEXT_BOX.value, FieldType.TEXTAREA.value,FieldType.USER_SINGLE.value,
+                FieldType.ORGAN_SINGLE.value, FieldType.STANDARD_MORE.value, FieldType.ORGAN_MORE.value]
+                .includes(item.fieldShowType)">
+            <a-form-item :label="item.dbFieldTxt" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input :placeholder="$t('pleaseEnter')+item.dbFieldTxt"
+                       v-model="queryParam[item.dbFieldName]"></a-input>
             </a-form-item>
           </template>
           <!--   数字输入框   -->
-          <template v-else-if="item.field_show_type === FieldType.TEXT_NUMBER.value">
-            <a-form-item :label="item.db_field_txt" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input-number :placeholder="$t('pleaseEnter')+item.db_field_txt"
-                              v-model="queryParam[item.db_field_name]" :min="1" :max="99999999"/>
-            </a-form-item>
-          </template>
+<!--          <template v-else-if="item.fieldShowType === FieldType.TEXT_NUMBER.value">-->
+<!--            <a-form-item :label="item.dbFieldTxt" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
+<!--              <a-input-number :placeholder="$t('pleaseEnter')+item.dbFieldTxt"-->
+<!--                              v-model="queryParam[item.dbFieldName]" :min="1" :max="99999999"/>-->
+<!--            </a-form-item>-->
+<!--          </template>-->
           <!--   字典多选框  -->
-          <template v-else-if="item.field_show_type === FieldType.PULL_MORE.value">
-            <a-form-item :label="item.db_field_txt" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-multi-select-tag v-model="queryParam[item.db_field_name]"
-                                  :placeholder="$t('pleaseSelect')+item.db_field_txt" :type="'select'"
-                                  :triggerChange="false" :dictCode="item.dict_field"/>
-            </a-form-item>
-          </template>
+<!--          <template v-else-if="item.fieldShowType === FieldType.OPTION_MORE.value">-->
+<!--            <a-form-item :label="item.dbFieldTxt" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
+<!--              <j-multi-select-tag v-model="queryParam[item.dbFieldName]"-->
+<!--                                  :placeholder="$t('pleaseSelect')+item.dbFieldTxt" :type="'select'"-->
+<!--                                  :triggerChange="false" :dictCode="item.dict_field"/>-->
+<!--            </a-form-item>-->
+<!--          </template>-->
           <!--   日期区间选择器  -->
-          <template v-else-if="[FieldType.DATE_SINGLE.value, FieldType.DATE_MORE.value].includes(item.field_show_type)">
-            <a-form-item :label="item.db_field_txt" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-range-picker v-model="queryParam[item.db_field_name]"
+          <template v-else-if="[FieldType.DATE_SINGLE.value, FieldType.DATE_MORE.value].includes(item.fieldShowType)">
+            <a-form-item :label="item.dbFieldTxt" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-range-picker v-model="queryParam[item.dbFieldName]"
                               format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-                              @change="onChange(item.db_field_name)"></a-range-picker>
+                              @change="onChange(item.dbFieldName)"></a-range-picker>
             </a-form-item>
           </template>
           <!--   字典选择器  -->
-          <template v-else-if="item.field_show_type === FieldType.PULL_SINGLE.value">
-            <a-form-item :label="item.db_field_txt" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-dict-select-tag v-model="queryParam[item.db_field_name]"
-                                 :placeholder="$t('pleaseSelect')+item.db_field_txt"
+          <template v-else-if="item.fieldShowType === FieldType.OPTION_SINGLE.value || item.fieldShowType === FieldType.OPTION_MORE.value">
+            <a-form-item :label="item.dbFieldTxt" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <j-dict-select-tag v-model="queryParam[item.dbFieldName]"
+                                 :placeholder="$t('pleaseSelect')+item.dbFieldTxt"
                                  :type="'select'"
                                  :triggerChange="false" :dictCode="item.dict_field"/>
             </a-form-item>
@@ -134,13 +136,13 @@
 
 <script>
 import JDictSelectTag from '../dict/JDictSelectTag'
-import JMultiSelectTag from '../dict/JMultiSelectTag'
 import { FieldType } from '../../enums/commonEnums'
 import eventBus from '@/common/event'
+import { getAction } from '@/api/manage'
 
 export default {
   name: 'Search',
-  components: { JDictSelectTag, JMultiSelectTag },
+  components: { JDictSelectTag },
   props: {
     url: {
       type: Object,
@@ -178,65 +180,65 @@ export default {
     }
   },
   mounted () {
-    // this.getSearch()
-    this.searchList = [
-      {
-        db_field_name: 'serial_number',
-        db_field_txt: '编号',
-        dict_field: '',
-        field_show_type: '1',
-        tree: []
-      },
-      {
-        db_field_name: 'title',
-        db_field_txt: '标题',
-        dict_field: '',
-        field_show_type: '1',
-        tree: []
-      },
-      {
-        db_field_name: 'state',
-        db_field_txt: '状态',
-        dict_field: 'state',
-        field_show_type: '3',
-        tree: []
-      },
-      {
-        db_field_name: 'region',
-        db_field_txt: '适用地区',
-        dict_field: 'region',
-        field_show_type: '4',
-        tree: []
-      },
-      {
-        db_field_name: 'technology_territory',
-        db_field_txt: '技术领域',
-        dict_field: 'technology_territory',
-        field_show_type: '0',
-        tree: []
-      },
-      {
-        db_field_name: 'issue_time',
-        db_field_txt: '发布日期',
-        dict_field: '',
-        field_show_type: '5',
-        tree: []
-      },
-      {
-        db_field_name: 'xin1_che1_xing2_shi2_shi1_ri4_qi1',
-        db_field_txt: '新车型实施日期',
-        dict_field: '',
-        field_show_type: '5',
-        tree: []
-      },
-      {
-        db_field_name: 'implement_time',
-        db_field_txt: '在产车实施日期',
-        dict_field: '',
-        field_show_type: '5',
-        tree: []
-      }
-    ]
+    this.getSearch()
+    // this.searchList = [
+    //   {
+    //     dbFieldName: 'serial_number',
+    //     dbFieldTxt: '编号',
+    //     dict_field: '',
+    //     fieldShowType: '1',
+    //     tree: []
+    //   },
+    //   {
+    //     dbFieldName: 'title',
+    //     dbFieldTxt: '标题',
+    //     dict_field: '',
+    //     fieldShowType: '1',
+    //     tree: []
+    //   },
+    //   {
+    //     dbFieldName: 'state',
+    //     dbFieldTxt: '状态',
+    //     dict_field: 'state',
+    //     fieldShowType: '3',
+    //     tree: []
+    //   },
+    //   {
+    //     dbFieldName: 'region',
+    //     dbFieldTxt: '适用地区',
+    //     dict_field: 'region',
+    //     fieldShowType: '4',
+    //     tree: []
+    //   },
+    //   {
+    //     dbFieldName: 'technology_territory',
+    //     dbFieldTxt: '技术领域',
+    //     dict_field: 'technology_territory',
+    //     fieldShowType: '0',
+    //     tree: []
+    //   },
+    //   {
+    //     dbFieldName: 'issue_time',
+    //     dbFieldTxt: '发布日期',
+    //     dict_field: '',
+    //     fieldShowType: '5',
+    //     tree: []
+    //   },
+    //   {
+    //     dbFieldName: 'xin1_che1_xing2_shi2_shi1_ri4_qi1',
+    //     dbFieldTxt: '新车型实施日期',
+    //     dict_field: '',
+    //     fieldShowType: '5',
+    //     tree: []
+    //   },
+    //   {
+    //     dbFieldName: 'implement_time',
+    //     dbFieldTxt: '在产车实施日期',
+    //     dict_field: '',
+    //     fieldShowType: '5',
+    //     tree: []
+    //   }
+    // ]
   },
   methods: {
     searchQuery () {
@@ -251,28 +253,28 @@ export default {
     // 获取查询条件列表
     getSearch () {
       const params = {
-        flag: this.flag
+        module: this.flag
       }
-      // getAction(this.url.getSearchList, params).then((res) => {
-      //   if (res.success) {
-      //     this.searchList = res.result
-      //     // if (this.searchQueryList && this.searchQueryList.length > 0) {
-      //     //   for (let i = 0; i < this.searchList.length; i++) {
-      //     //     // 是要去掉这个字段的搜索？？
-      //     //     if (this.searchList[i].db_field_name === 'issue_time') {
-      //     //       this.searchList.splice(i, 1)
-      //     //       i--
-      //     //     }
-      //     //     // db_field_name 说明可以被代替位置？？
-      //     //     if (this.searchList[i].db_field_name === 'title') {
-      //     //       const data = this.searchList[i + 1]
-      //     //       this.searchList[i + 1] = this.searchQueryList[0]
-      //     //       this.searchList.push(data)
-      //     //     }
-      //     //   }
-      //     // }
-      //   }
-      // })
+      getAction(this.url.getSearchList, params).then((res) => {
+        if (res.success) {
+          this.searchList = res.result
+          // if (this.searchQueryList && this.searchQueryList.length > 0) {
+          //   for (let i = 0; i < this.searchList.length; i++) {
+          //     // 是要去掉这个字段的搜索？？
+          //     if (this.searchList[i].db_field_name === 'issue_time') {
+          //       this.searchList.splice(i, 1)
+          //       i--
+          //     }
+          //     // db_field_name 说明可以被代替位置？？
+          //     if (this.searchList[i].db_field_name === 'title') {
+          //       const data = this.searchList[i + 1]
+          //       this.searchList[i + 1] = this.searchQueryList[0]
+          //       this.searchList.push(data)
+          //     }
+          //   }
+          // }
+        }
+      })
     },
     onChange (item) {
       if (this.queryParam[item] && this.queryParam[item].length > 0) {
diff --git a/src/components/selection/StandardSelection.vue b/src/components/selection/StandardSelection.vue
index 4757dc13..a09dcec2 100644
--- a/src/components/selection/StandardSelection.vue
+++ b/src/components/selection/StandardSelection.vue
@@ -1,9 +1,9 @@
 <template>
   <div>
     <div class="box-title-text">
-      <a-input class="box-input" :value="value" :title="value" @input="indexClick($event)"
-               :disabled="isDisabled"
-               :placeholder="!isDisabled?$t('pleaseEnterOrSelect')+query.db_field_txt:query.db_field_txt"/>
+      <a-input class="box-input" :value="value" :title="value" @click="standardClick"
+               :disabled="isDisabled" readonly
+               :placeholder="!isDisabled?$t('pleaseSelect')+query.dbFieldTxt:query.dbFieldTxt"/>
       <a-button v-if="!isDisabled" type="primary" class="button-box" @click="standardClick">
         {{this.$t('standardSelect.standardSelection')}}
       </a-button>
@@ -153,17 +153,17 @@ export default {
           serialNumber.push(res.serial_number)
           replaceStandardId.push(res.id)
         })
-        this.$emit('input', serialNumber.join(','))
-        this.$emit('change', this.query.db_field_name, replaceStandardId.join(','))
+        // this.$emit('input', serialNumber.join(','))
+        this.$emit('change', this.query.dbFieldName, replaceStandardId.join(','))
         // this.$emit('changecontent', this.content)
         this.visible = false
       } else {
         this.$message.warning(this.$t('selectLeastOne'))
       }
     },
-    indexClick (event) {
-      this.$emit('input', event.target.value)
-    },
+    // indexClick (event) {
+    //   this.$emit('input', event.target.value)
+    // },
     onSelectChange (value, row) {
       this.selectedRowKeys = value
       this.selectedRowList = row
diff --git a/src/components/selection/UserOrOrganSelection.vue b/src/components/selection/UserOrOrganSelection.vue
index ef43ae15..4cb50b30 100644
--- a/src/components/selection/UserOrOrganSelection.vue
+++ b/src/components/selection/UserOrOrganSelection.vue
@@ -8,7 +8,7 @@
         {{this.$t('userOrOrganSelect.select')}}
       </a-button>
     </div>
-    <user-organ-select-modal ref="selectModal" :selectType="selectType" @change="selectChange"></user-organ-select-modal>
+    <user-organ-select-modal v-bind="$attrs" ref="selectModal" :selectType="selectType" @change="selectChange"></user-organ-select-modal>
   </div>
 </template>
 
@@ -27,6 +27,10 @@ export default {
       type: String,
       default: 'all'
     },
+    placeholder: {
+      type: String,
+      default: ''
+    },
     value: {
       type: Object,
       default: () => {
@@ -37,6 +41,9 @@ export default {
       }
     }
   },
+  mounted () {
+    console.log(this.type)
+  },
   data () {
     return {
       selectValue: []
@@ -52,7 +59,12 @@ export default {
       } else {
         this.selectValue = arrOne
       }
+      this.$emit('change', this.selectType)
     }
+  },
+  model: {
+    prop: 'value',
+    event: 'change'
   }
 }
 </script>
diff --git a/src/components/selection/UserOrganSelectModal.vue b/src/components/selection/UserOrganSelectModal.vue
index f4f98cb4..3b7944ee 100644
--- a/src/components/selection/UserOrganSelectModal.vue
+++ b/src/components/selection/UserOrganSelectModal.vue
@@ -62,10 +62,10 @@
         <div class="modal-content-title-div">
           <p class="modal-content-title">选择</p>
           <div class="table-operator-tab">
-            <a class="switch-item" :class="switchValue === 'organ' ? 'table-operator-tab-active' : ''"
+            <a v-if="selectType === 'all' || selectType === 'organ'" class="switch-item" :class="switchValue === 'organ' ? 'table-operator-tab-active' : ''"
                @click="switchChange('organ')">组织机构
             </a>
-            <a class="switch-item" :class="switchValue === 'user' ? 'table-operator-tab-active' : ''"
+            <a v-if="selectType === 'all' || selectType === 'user'" class="switch-item" :class="switchValue === 'user' ? 'table-operator-tab-active' : ''"
                @click="switchChange('user')">用户列表
             </a>
           </div>
@@ -78,7 +78,7 @@
           :scroll="{x: 500}"
           :data-source="dataSourceOrgan"
           :pagination="ipaginationOrgan"
-          :row-selection="{ selectedRowKeys: selectedRowKeysOrgan, onChange: onSelectChangeOrgan, getCheckboxProps: getCheckboxPropsOrgan }"
+          :row-selection="{ selectedRowKeys: selectedRowKeysOrgan, onChange: onSelectChangeOrgan, getCheckboxProps: getCheckboxPropsOrgan, type: type }"
           :loading="loadingLeft"
           @change="organLeftTableChange">
         </a-table>
@@ -90,7 +90,7 @@
           :scroll="{x: 500}"
           :data-source="dataSourceUser"
           :pagination="ipaginationUser"
-          :row-selection="{ selectedRowKeys: selectedRowKeysUser, onChange: onSelectChangeUser, getCheckboxProps: getCheckboxPropsUser }"
+          :row-selection="{ selectedRowKeys: selectedRowKeysUser, onChange: onSelectChangeUser, getCheckboxProps: getCheckboxPropsUser, type: type }"
           :loading="loadingLeft"
           @change="userLeftTableChange">
         </a-table>
@@ -139,6 +139,10 @@ export default {
       type: String,
       default: 'all'
     },
+    type: { // 是单选还是多选
+      type: String,
+      default: 'radio'
+    },
     value: {
       type: Object,
       default: () => {
@@ -154,30 +158,45 @@ export default {
       immediate: true,
       handler (val) {
         if (this.selectType === 'all') {
-          if (val.organ) {
-            this.loadOrganRight(val.organ, () => {
-              if (val.user) {
-                this.loadUserRight(val.user, () => {
-                  this.$emit('change', this.dataSourceOrganRight, this.dataSourceUserRight)
-                })
-              } else {
-                this.$emit('change', this.dataSourceOrganRight, [])
-              }
-            })
-          } else {
-            this.loadUserRight(val.user, () => {
-              this.$emit('change', [], this.dataSourceUserRight)
-            })
+          if (val.organ && val.organ.length > 0) {
+            this.dataSourceOrganRight = val.organ
+            this.selectedRowKeysOrgan = val.organ.map(item => item.id)
           }
-        } else if (this.selectType === 'organ') {
-          this.loadOrganRight(val.organ, () => {
-            this.$emit('change', this.dataSourceOrganRight)
-          })
-        } else if (this.selectType === 'user') {
-          this.loadUserRight(val.user, () => {
-            this.$emit('change', this.dataSourceUserRight)
-          })
+          if (val.user && val.user.length > 0) {
+            this.dataSourceUserRight = val.user
+            this.selectedRowKeysUser = val.user.map(item => item.id)
+          }
+        } else if (this.selectType === 'organ' && val.organ && val.organ.length > 0) {
+          this.dataSourceOrganRight = val.organ
+          this.selectedRowKeysOrgan = val.organ.map(item => item.id)
+        } else if (this.selectType === 'user' && val.user && val.user.length > 0) {
+          this.dataSourceUserRight = val.user
+          this.selectedRowKeysUser = val.user.map(item => item.id)
         }
+        // if (val.organ) {
+        //   this.loadOrganRight(val.organ, () => {
+        //     if (val.user) {
+        //       this.loadUserRight(val.user, () => {
+        //         this.$emit('change', this.dataSourceOrganRight, this.dataSourceUserRight)
+        //       })
+        //     } else {
+        //       this.$emit('change', this.dataSourceOrganRight, [])
+        //     }
+        //   })
+        // } else {
+        //   this.loadUserRight(val.user, () => {
+        //     this.$emit('change', [], this.dataSourceUserRight)
+        //   })
+        // }
+        // } else if (this.selectType === 'organ') {
+        //   this.loadOrganRight(val.organ, () => {
+        //     this.$emit('change', this.dataSourceOrganRight)
+        //   })
+        // } else if (this.selectType === 'user') {
+        //   this.loadUserRight(val.user, () => {
+        //     this.$emit('change', this.dataSourceUserRight)
+        //   })
+        // }
       }
     }
   },
@@ -299,13 +318,19 @@ export default {
       ],
       dataSourceUserRight: [],
       url: {
-        organList: '',
+        organList: '/sys/sysDepart/queryTreeList',
         userList: '/sys/user/page'
       }
     }
   },
-  created () {
-    this.loadDataOrgan()
+  mounted () {
+    if (this.selectType === 'all' || this.selectType === 'organ') {
+      this.switchValue = 'organ'
+      this.loadDataOrgan()
+    } else {
+      this.switchValue = 'user'
+      this.loadDataUser()
+    }
   },
   methods: {
     open () {
@@ -348,12 +373,12 @@ export default {
       this.loadingLeft = true
       getAction(this.url.organList, params).then((res) => {
         if (res.success) {
-          if (res.result.current > 1 && res.result.records.length === 0) {
+          if (res.result.current > 1 && res.result.length === 0) {
             this.ipaginationOrgan.current = res.result.current - 1
             this.loadDataOrgan()
             return
           }
-          this.dataSourceOrgan = res.result.records || []
+          this.dataSourceOrgan = res.result || []
           this.ipaginationOrgan.total = res.result.total
         } else {
           this.$message.warn(res.message)
@@ -385,19 +410,19 @@ export default {
       this.selectedRowKeysOrgan = this.selectedRowKeysOrgan.filter(item => item === record.id)
     },
     // 组织机构初始化右侧树列表
-    loadOrganRight (ids, callback) {
-      this.loadingRight = true
-      getAction(this.url.organList, { ids: ids }).then((res) => {
-        if (res.success) {
-          this.dataSourceOrganRight = res.result.records || []
-          callback && callback()
-        } else {
-          this.$message.warn(res.message)
-        }
-      }).finally(() => {
-        this.loadingRight = false
-      })
-    },
+    // loadOrganRight (ids, callback) {
+    //   this.loadingRight = true
+    //   getAction(this.url.organList, { ids: ids }).then((res) => {
+    //     if (res.success) {
+    //       this.dataSourceOrganRight = res.result.records || []
+    //       callback && callback()
+    //     } else {
+    //       this.$message.warn(res.message)
+    //     }
+    //   }).finally(() => {
+    //     this.loadingRight = false
+    //   })
+    // },
     /**
      * 用户相关方法
      */
@@ -453,19 +478,19 @@ export default {
       this.selectedRowKeysUser = this.selectedRowKeysUser.filter(item => item === record.id)
     },
     // 用户初始化右侧树列表
-    loadUserRight (ids, callback) {
-      this.loadingRight = true
-      getAction(this.url.userList, { ids: ids }).then((res) => {
-        if (res.success) {
-          this.dataSourceUserRight = res.result.records || []
-          callback && callback()
-        } else {
-          this.$message.warn(res.message)
-        }
-      }).finally(() => {
-        this.loadingRight = false
-      })
-    },
+    // loadUserRight (ids, callback) {
+    //   this.loadingRight = true
+    //   getAction(this.url.userList, { ids: ids }).then((res) => {
+    //     if (res.success) {
+    //       this.dataSourceUserRight = res.result.records || []
+    //       callback && callback()
+    //     } else {
+    //       this.$message.warn(res.message)
+    //     }
+    //   }).finally(() => {
+    //     this.loadingRight = false
+    //   })
+    // },
     handleOk () {
       if (this.selectType === 'all') {
         this.$emit('change', this.dataSourceOrganRight, this.dataSourceUserRight)
@@ -487,10 +512,6 @@ export default {
       this.selectedRowKeysOrgan = []
       this.selectedRowKeysUser = []
     }
-  },
-  model: {
-    prop: 'value',
-    event: 'change'
   }
 }
 </script>
diff --git a/src/enums/commonEnums.js b/src/enums/commonEnums.js
index 8c14a507..1402fb6a 100644
--- a/src/enums/commonEnums.js
+++ b/src/enums/commonEnums.js
@@ -8,18 +8,17 @@ export const YesOrNoEnum = new EsEnums({
 // 既可以使用EsEnums 也可以单独写明
 
 export const FieldType = {
-  TREE: { text: '树形结构', value: '0' },
-  TEXT_STRING: { text: '输入框(字符串)', value: '1' },
-  TEXT_NUMBER: { text: '输入框(数字)', value: '2' },
-  PULL_SINGLE: { text: '单选下拉框', value: '3' },
-  PULL_MORE: { text: '多选下拉框', value: '4' },
-  DATE_SINGLE: { text: '单日期选择', value: '5' },
-  DATE_MORE: { text: '多日期选择', value: '6' },
-  FILE: { text: '文件', value: '7' },
-  TEXT: { text: '文本框', value: '8' },
-  PERSON: { text: '人员选择', value: '9' },
-  STANDARD: { text: '标准选择', value: '10' },
-  TEXT_LINK: { text: '输入框(链接)', value: '11' }
+  DATE_SINGLE: { text: '单日期选择', value: '1' },
+  USER_SINGLE: { text: '单选用户弹框', value: '2' },
+  ORGAN_SINGLE: { text: '单选组织机构弹框', value: '3' },
+  DATE_MORE: { text: '多日期选择', value: '4' },
+  TEXTAREA: { text: '多行文本', value: '5' },
+  STANDARD_MORE: { text: '多选标准弹框', value: '6' },
+  ORGAN_MORE: { text: '多选组织机构弹框', value: '7' },
+  FILE_UP: { text: '上传文件', value: '8' },
+  TEXT_BOX: { text: '文本框', value: '9' },
+  OPTION_SINGLE: { text: '下拉单选', value: '10' },
+  OPTION_MORE: { text: '下拉多选', value: '11' }
 }
 
 export const TagsTypeEnums = new EsEnums({
diff --git a/src/mixins/ConfigurableTableMixin.js b/src/mixins/ConfigurableTableMixin.js
index 6747de0b..f7eb3bcf 100644
--- a/src/mixins/ConfigurableTableMixin.js
+++ b/src/mixins/ConfigurableTableMixin.js
@@ -3,6 +3,7 @@
  */
 import { getAction, postAction } from '@api/manage'
 import { isHasPermission } from '../utils/hasPermission'
+import { getTableHeader } from '@api/api'
 
 // 模拟接口返回的表头数据
 const TempApiReturnColumns = [
@@ -57,7 +58,7 @@ export const ConfigurableTableMixin = {
         fixed: 'right',
         scopedSlots: { customRender: 'operation' }
       },
-      type: '', // 这个字段不知道什么含义
+      // type: '', // 这个字段不知道什么含义
       filters: {}, // 固定的搜索条件
       needFilterTableBtn: true // 是否需要过滤没有权限的按钮
     }
@@ -99,7 +100,7 @@ export const ConfigurableTableMixin = {
         this.columns = this.dealColumns(TempApiReturnColumns)
         return
       }
-      const params = { flag: this.flag }
+      const params = { module: this.flag }
       getAction(this.url.tableHeader, params).then(res => {
         if (res.success) {
           this.columns = this.dealColumns(res.result || [])
@@ -131,8 +132,8 @@ export const ConfigurableTableMixin = {
         // 是否可排序
         item.sorter = item.sort === 'true'
         item.width = 215
-        item.title = item.db_field_txt
-        item.dataIndex = item.db_field_name
+        item.title = item.dbFieldTxt
+        item.dataIndex = item.dbFieldName
         item.align = 'left'
         tempColumns.push(item)
       })
@@ -170,7 +171,7 @@ export const ConfigurableTableMixin = {
         ...this.searchParams,
         orderBy: this.orderBy,
         orderByField: this.orderByField,
-        type: this.type,
+        module: this.flag,
         pageNo: pageNo,
         pageSize: pageSize
       }
diff --git a/src/views/documentManage/DocumentLibrary.vue b/src/views/documentManage/DocumentLibrary.vue
index c8aa7a6f..0752f7ca 100644
--- a/src/views/documentManage/DocumentLibrary.vue
+++ b/src/views/documentManage/DocumentLibrary.vue
@@ -1,7 +1,7 @@
 <template>
   <a-card :bordered="false">
     <div class="table-page-search-wrapper">
-      <search ref="searchRef" :flag="'1'" :url="url" @search="searchQuery" @reset="searchReset" />
+      <search ref="searchRef" :flag="flag" :url="url" @search="searchQuery" @reset="searchReset" />
     </div>
     <div class="table-operator">
       <div class="operator-text" @click="handleBatchDel">
@@ -135,6 +135,7 @@ export default {
   mixins: [ConfigurableTableMixin],
   data () {
     return {
+      flag: '1',
       operationList: [
         {
           text: this.$t('docLibrary.cancelCollection'),
@@ -162,11 +163,10 @@ export default {
       tokenHeader: { 'X-Access-Token': Vue.ls.get(ACCESS_TOKEN) },
       // url传参严格按照当前命名
       url: {
-        // tableHeader: '/document/bussDocumentLibraryEO/getHeader', // 表格头部字段
-        tableHeader: '', // 表格头部字段
-        getSearchList: '/document/bussDocumentLibraryEO/queryCondition', // 搜索字段
-        list: 'document/bussDocumentLibraryEO/queryPageInfo', // 表格数据
-        getAddForm: 'document/bussDocumentLibraryEO/getAddForm', // 表单的字段
+        tableHeader: '/laws/common/getCommonHeader', // 表格头部字段
+        getSearchList: '/laws/common/getQueryCondition', // 搜索字段
+        list: '/laws/common/getCommonPage', // 表格数据
+        getAddForm: '/laws/common/getFormModel', // 表单的字段
         addInfo: 'document/bussDocumentLibraryEO/addInfo', // 新增
         updateInfo: 'document/bussDocumentLibraryEO/updateInfo', // 编辑
         getDocumentInfo: 'document/bussDocumentLibraryEO/getDocumentInfoById', // 查看