diff --git a/Code/Fe/src/components/addEditFromApiPop/index.vue b/Code/Fe/src/components/addEditFromApiPop/index.vue
index ed14da5..f33f41d 100644
--- a/Code/Fe/src/components/addEditFromApiPop/index.vue
+++ b/Code/Fe/src/components/addEditFromApiPop/index.vue
@@ -9,87 +9,120 @@
     class="searchPageComponents"
     :fullscreen="true"
     style="width:calc(100% - 28px);left:14px;top:14px;height:calc(100% - 28px)"
+    v-loading="Loading.addEditApiLoading"
   >
-    <!-- 标题 -->
-    <div class="dialogOuterTitle">{{formTitle}}</div>
     <!-- 表单 -->
-    <el-form 
-      ref="addEditFrom_Ref"
-      v-if="formData"
-      :model="formData"
-      :rules="formRules"
-    >
-      <el-row :gutter="40">
-        <el-col
-          :span="item.colSpan || 12"
-          v-for="(item, index) in formItemData"
-          :key="index"
-        >
-          <el-form-item 
-            :label="item.label"
-            :prop="item.prop"
+    <div v-if="active === 0" style="height: 100%;">
+      <!-- 标题 -->
+      <div class="dialogOuterTitle">{{formTitle}}</div>
+      <!-- 表单 -->
+      <el-form 
+        class="addEditFrom"
+        ref="addEditFrom_Ref"
+        v-if="formData"
+        :model="formData"
+        :rules="formRules"
+      >
+        <el-row :gutter="40">
+          <el-col
+            :span="item.colSpan || 12"
+            v-for="(item, index) in formItemData"
+            :key="index"
           >
-            <!-- 数值 -->
-            <el-input-number
-              v-if="item.apiBaseType === 'number'"
-              v-model="formData[item.prop]"
-              :min="item.minimum || undefined"
-              :max="item.maximum || undefined"
-              :maxlength="item.maxLength || undefined"
-              :minlength="item.minLength || undefined"
-              :disabled="Boolean(item.disabled)"
-              :placeholder="item.placeholder || '请输入' + item.label"
-              @change="changeValue(item.prop,item,$event)"
-              @clear="clearValue(item.prop,$event)"
-            ></el-input-number>
+            <el-form-item 
+              :label="item.label"
+              :prop="item.prop"
+            >
+              <!-- 数值 -->
+              <el-input-number
+                v-if="item.apiBaseType === 'number'"
+                v-model="formData[item.prop]"
+                :min="item.minimum || undefined"
+                :max="item.maximum || undefined"
+                :maxlength="item.maxLength || undefined"
+                :minlength="item.minLength || undefined"
+                :disabled="Boolean(item.disabled)"
+                :placeholder="item.placeholder || '请输入' + item.label"
+                @change="changeValue(item.prop,item,$event)"
+                @clear="clearValue(item.prop,$event)"
+              ></el-input-number>
 
-            <!-- 时间转换 -->
-            <el-date-picker
-              v-else-if="item.apiBaseType === 'datetime'"
-              v-model="formData[item.prop]"
-              type="datetime"
-              placeholder="选择日期时间"
-              format="yyyy-MM-dd HH:mm:ss"
-              value-format="yyyy-MM-ddTHH:mm:ss"
-              :disabled="Boolean(item.disabled)"
-            ></el-date-picker>
+              <!-- 时间转换 -->
+              <el-date-picker
+                v-else-if="item.apiBaseType === 'datetime'"
+                v-model="formData[item.prop]"
+                type="datetime"
+                placeholder="选择日期时间"
+                format="yyyy-MM-dd HH:mm:ss"
+                value-format="yyyy-MM-ddTHH:mm:ss"
+                :disabled="Boolean(item.disabled)"
+              ></el-date-picker>
 
-            <!-- 布尔、枚举 -->
-            <el-select 
-              v-else-if="item.isEnums || item.apiBaseType === 'boolean'"
-              v-model="formData[item.prop]" 
-              :placeholder="item.placeholder || '请选择' + item.label"
-              :disabled="Boolean(item.disabled)"
-            >
-              <el-option
-                v-for="item in getItemEnums(item)"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              ></el-option>
-            </el-select>
+              <!-- 布尔、枚举 -->
+              <el-select 
+                v-else-if="item.isEnums || item.apiBaseType === 'boolean'"
+                v-model="formData[item.prop]" 
+                :placeholder="item.placeholder || '请选择' + item.label"
+                :disabled="Boolean(item.disabled)"
+              >
+                <el-option
+                  v-for="item in getItemEnums(item)"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                ></el-option>
+              </el-select>
 
-            <!-- 文本框 -->
-            <el-input 
-              v-else
-              v-model="formData[item.prop]"
-              :placeholder="item.placeholder || '请输入' + item.label"
-              :disabled="Boolean(item.disabled)"
-            ></el-input>
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <!-- 操作按钮 -->
-    <span slot="footer" class="dialog-footer">
-      <el-button @click="show = false">取 消</el-button>
-      <el-button type="primary" @click="submitHandle()">确 定</el-button>
-    </span>
+              <!-- 文本框 -->
+              <el-input 
+                v-else
+                v-model="formData[item.prop]"
+                :placeholder="item.placeholder || '请输入' + item.label"
+                :disabled="Boolean(item.disabled)"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <!-- 操作按钮 -->
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="show = false">取 消</el-button>
+        <el-button type="primary" @click="submitHandle()">确 定</el-button>
+      </div>
+    </div>
+    <!-- 成功提示 -->
+    <div v-if="active === 1">
+      <el-result icon="success" title="成功提示" :subTitle="formTitle + '成功'">
+        <template slot="extra">
+          <el-button type="primary" size="medium" @click="exitHandle"
+            >退出</el-button
+          >
+        </template>
+      </el-result>
+    </div>
+    <!-- 错误提示 -->
+    <div v-if="active === 2">
+      <el-result icon="error" title="错误提示" :subTitle="formTitle + '失败'">
+        <template slot="extra">
+          <el-button type="primary" size="medium" @click="changeActive(0)"
+            >返回</el-button
+          >
+          <el-button type="primary" size="medium" @click="exitHandle"
+            >退出</el-button
+          >
+        </template>
+      </el-result>
+    </div>
   </el-dialog>
 </template>
 <script>
+import { postCreate, postUpdate } from "@/api/wms-api"
+import { LoadingMixins } from "@/mixins/LoadingMixins";
+import { tableMixins } from "@/mixins/TableMixins"
+import * as allUrlOption from '@/utils/baseData/urlOption'
 export default {
   name:"addEditFromApiPop",
+  mixins:[ LoadingMixins,tableMixins ],
   props: {
     // 编辑行数据
     editRowData:{
@@ -100,10 +133,32 @@ export default {
     handleType:{
       type: String,
       default: null
+    },
+    // 提交事件
+    submitForm:{
+      type:Function,
+      default:null
+    },
+    // 特殊的【新增】接口，如果没有就走路由下的配置文件
+    addSubmitUrl:{
+      type: String,
+      default: null
+    },
+    // 特殊的【编辑】接口，如果没有就走路由下的配置文件
+    editSubmitUrl:{
+      type: String,
+      default: null
     }
   },
   data () {
     return {
+      // 新增
+      URLOption_base:allUrlOption[this.$route.name].baseURL,
+      // 新增
+      URLOption_add:allUrlOption[this.$route.name].addURL,
+      // 编辑
+      URLOption_edit:allUrlOption[this.$route.name].editURL,
+      active:0,//显示内容：0表单 1成功 2失败
       show:true,
       formTitle:null,//form名称
       formData:{},//表单数据
@@ -128,6 +183,10 @@ export default {
       let _dtoList_type = this.handleType == 'add' ? 'C' : 'U'
       let _dtoList = data[this.$route.name][_dtoList_type].dtoList
       this.formItemData = JSON.parse(JSON.stringify(_dtoList))
+      // 编辑格式：特殊处理默认值
+      if(this.handleType == 'edit' && this.editRowData){
+
+      }
       // 表单验证格式化
       this.formRules={}
       _dtoList.forEach(item=>{
@@ -162,22 +221,52 @@ export default {
     // 提交表单
     submitHandle(){
       this.$refs.addEditFrom_Ref.validate((valid) => {
+        if(this.submitForm){
+          this.submitForm(valid,this.formData,this.handleType,this.formItemData,this.formRules)
+          return
+        }
+        let _updata = this.handleType == 'add' ? this.URLOption_add : this.URLOption_edit
+        let _url = _updata ? _updata : this.URLOption_base
+        this.Loading.addEditApiLoading = true
         if (valid) {
-          console.log(this.handleType,this.formData)
           // 新增
           if(this.handleType == 'add'){
-
+            if(!_updata){_url = _url + '/create'}
+            postCreate(this.formData, _url).then(res => {
+              this.changeActive(1)
+            }).catch(err => {
+              this.changeActive(2)
+            })
           }
           // 编辑
           else{
-
+            if(!_updata){_url = _url + '/update-by-id'}
+            postUpdate(this.formData, this.formData.id, _url).then(res => {
+              this.changeActive(1)
+            }).catch(err => {
+              this.changeActive(2)
+            })
           }
-          this.show = false
         } else {
           return false;
         }
       });
     },
+    // 结果页退出
+    exitHandle(){
+      this.close()
+      if(this.active == '1')this.oldSkipCount = 1;
+      this.show = false
+      this.paging()
+      this.$nextTick(()=>{
+        this.active = 0
+      })
+    },
+    // 更改页面步骤
+    changeActive(sta){
+      this.active = sta
+      this.Loading.addEditApiLoading = false
+    },
     // 值更改函数
     changeValue(prop,item,val) {
       this.$emit("changeValue", prop, item, val)
@@ -185,7 +274,7 @@ export default {
     // 值清除函数
     clearValue(prop,item,val) {
       this.$emit("clearValue", prop, item, val)
-    }
+    },
   }
 }
 </script>
@@ -194,6 +283,13 @@ export default {
   ::v-deep .el-dialog__header{
     padding:  0 !important;
   }
+  ::v-deep .el-row{
+    width: 100%;
+  }
+  ::v-deep .addEditFrom{
+    height: calc(100% - 120px);
+    overflow: auto;
+  }
   ::v-deep .el-form-item__label{
     float: unset;
   }
@@ -201,4 +297,9 @@ export default {
   ::v-deep .el-input,.el-select,.el-input-number{
     width: 100% !important;
   }
+
+  .dialog-footer{
+    padding-top: 15px;
+    text-align: right;
+  }
 </style>
\ No newline at end of file
diff --git a/Code/Fe/src/mixins/LoadingMixins.js b/Code/Fe/src/mixins/LoadingMixins.js
index 703429c..3d96735 100644
--- a/Code/Fe/src/mixins/LoadingMixins.js
+++ b/Code/Fe/src/mixins/LoadingMixins.js
@@ -9,6 +9,8 @@ export const LoadingMixins = {
         newAndEdiLoading: false,
         autoTableLoading: false,
         appMainLoading: false,
+        // fast-new
+        addEditApiLoading:false,//Api 新增编辑
       },
       //Dialog显示状态
       displayDialog: {
diff --git a/Code/Fe/src/mixins/TableHeaderMixins.js b/Code/Fe/src/mixins/TableHeaderMixins.js
index b914721..c8482fb 100644
--- a/Code/Fe/src/mixins/TableHeaderMixins.js
+++ b/Code/Fe/src/mixins/TableHeaderMixins.js
@@ -32,6 +32,7 @@ export const TableHeaderMixins = {
     // 关闭主表新增编辑api
     closeAddEditApiPop(){
       this.addEditApiType = null
+      this.editFromApiRowData = null
       this.displayDialog.addEditApiDialog = false
     },
     // 导出功能
diff --git a/Code/Fe/src/mixins/TableMixins.js b/Code/Fe/src/mixins/TableMixins.js
index 01cdc38..35999f9 100644
--- a/Code/Fe/src/mixins/TableMixins.js
+++ b/Code/Fe/src/mixins/TableMixins.js
@@ -91,6 +91,7 @@ export const tableMixins = {
       // 编辑 api
       if (item.name == "editFromApi") {
         this.addEditApiType = 'edit'
+        this.editFromApiRowData = row
         this.displayDialog.addEditApiDialog = true;
       }
       // 删除
diff --git a/Code/Fe/src/mixins/mixins.js b/Code/Fe/src/mixins/mixins.js
index 642d849..03e8d2e 100644
--- a/Code/Fe/src/mixins/mixins.js
+++ b/Code/Fe/src/mixins/mixins.js
@@ -18,8 +18,6 @@ export const mixins = {
       URLOption_add:allUrlOption[this.$route.name].addURL,
       // 编辑
       URLOption_edit:allUrlOption[this.$route.name].editURL,
-      // 新增和编辑
-      URLOption_updata:allUrlOption[this.$route.name].updataURL,
       //明细-查看主表
       URLOption_parent:allUrlOption[this.$route.name].parentURL ? allUrlOption[this.$route.name].parentURL : allUrlOption[this.$route.name].detailURL,
       //明细-查看主表的连接id
@@ -67,6 +65,7 @@ export const mixins = {
       ],
 
       addEditApiType: null,//Api新增编辑方式(add,edit) 
+      editFromApiRowData:null,//Api编辑方式的默认值
     }
   },
   methods: {
diff --git a/Code/Fe/src/mixins/newAndEdiDialogMixins.js b/Code/Fe/src/mixins/newAndEdiDialogMixins.js
index 4b5383d..3bd091e 100644
--- a/Code/Fe/src/mixins/newAndEdiDialogMixins.js
+++ b/Code/Fe/src/mixins/newAndEdiDialogMixins.js
@@ -51,10 +51,10 @@ export const newAndEdiDialogMixins = {
       this.ref = val
       this.Loading.newAndEdiLoading = true
       let _updata = this.formReveal ? this.URLOption_add : this.URLOption_edit
-      let _url = this.URLOption_updata ? this.URLOption_updata : (_updata ? _updata : this.URLOption_base)
+      let _url = _updata ? _updata : this.URLOption_base
       switch (this.formReveal) {
         case true:
-          if(!_updata && !this.URLOption_updata){_url = _url + '/create'}
+          if(!_updata){_url = _url + '/create'}
           postCreate(this.CreateFormData, _url).then(res => {
             this.oldSkipCount = 1;
             this.Loading.newAndEdiLoading = false
@@ -65,7 +65,7 @@ export const newAndEdiDialogMixins = {
           })
           break;
         case false:
-          if(!_updata && !this.URLOption_updata){_url = _url + '/update-by-id'}
+          if(!_updata){_url = _url + '/update-by-id'}
           postUpdate(this.editFormData, this.editFormData.id, _url).then(res => {
             this.propsData = res
             this.Loading.newAndEdiLoading = false
diff --git a/Code/Fe/src/utils/baseData/urlOption.js b/Code/Fe/src/utils/baseData/urlOption.js
index 0b7fbe6..7747726 100644
--- a/Code/Fe/src/utils/baseData/urlOption.js
+++ b/Code/Fe/src/utils/baseData/urlOption.js
@@ -8,9 +8,8 @@ export const TestSchool = {
     masterName:'studentName'//明细获取主表信息的title名称
     // parentURL:null,//明细-查看主表:特殊接口，如果没有则走detailURL
     // deleteURL:null,//删除特殊URL
-    // updataURL:null,//新增+编辑特殊URL（新增+编辑使用一个）
-    // addURL:null,//新增特殊URL（有此参数，updataURL无效）
-    // editURL:null,//编辑特殊URL（有此参数，updataURL无效）
+    // addURL:null,//新增特殊URL
+    // editURL:null,//编辑特殊URL
     // exportURL:'exportURL',//导出特殊URL
 }
 
diff --git a/Code/Fe/src/views/login/index.vue b/Code/Fe/src/views/login/index.vue
index 6580f64..bbf2fb0 100644
--- a/Code/Fe/src/views/login/index.vue
+++ b/Code/Fe/src/views/login/index.vue
@@ -180,7 +180,6 @@ export default {
           return
           this.loading = true
           this.loginForm.userNameOrEmailAddress = this.loginForm.username
-          // todo-new:与permission文件的登录统一封装
           let _zh = localStorage.getItem('columnsApiNamesZh')
           login(this.loginForm).then(()=>{
           // this.$store.dispatch('user/login', this.loginForm).then(() => {
diff --git a/Code/Fe/src/views/menuList/ExportCustomUserSetting.vue b/Code/Fe/src/views/menuList/ExportCustomUserSetting.vue
new file mode 100644
index 0000000..1ee030d
--- /dev/null
+++ b/Code/Fe/src/views/menuList/ExportCustomUserSetting.vue
@@ -0,0 +1,324 @@
+
+<template>
+    <div class="page-box" v-loading="Loading.tableLoading">
+      <tablePagination
+        v-if="apiColumns_Table"
+        :currenButtonData="currenButtonData"
+        :tableData="tableData"
+        :tableLoading="Loading.tableLoading"
+        :tableColumns="apiColumns_Table"
+        @rowDrop="rowDrop"
+        :totalCount="totalCount"
+        :multipleSelection="multipleSelection"
+        :MaxResultCount="PageListParams.MaxResultCount"
+        @topbutton="topbutton"
+        @inlineDialog="inlineDialog"
+        @sortChange="sortChange"
+        @alertoldSkipCount="alertoldSkipCount"
+        @alterResultCount="alterResultCount"
+        @handleSelectionChange="handleSelectionChange"
+        :currentPageProps="oldSkipCount"
+        :quicklySearchOption="quicklySearchOption"
+        @quicklySearchClick="quicklySearchClick"
+        @quicklySearchClear="quicklySearchClear"
+        :primarySearchOption="primarySearchOption"
+        @overallSearchFormClick="overallSearchFormClick"
+        :httpOverallSearchData="httpOverallSearchData"
+        :buttonOperationList_right="buttonOperationList_rightBase"
+        @buttonOperationClick_right="buttonOperationClick_right"
+      >
+      <!-- :buttonOperationList_left="buttonOperationClick_leftBase"
+        @buttonOperationClick_left="buttonOperationClick_left" -->
+        <!-- <div slot="tableTopSlot">
+          上方按钮插槽位置预留
+        </div> -->
+        <!-- <div slot="searchPrimarySlot">
+          普通初级搜索插槽位置预留
+        </div> -->
+        <!-- <template>表格内容插槽位置预留</template> -->
+      </tablePagination>
+      <!-- 新增与编辑 -->
+      <newAndEdiDialog
+        :loading="Loading.newAndEdiLoading"
+        :active="active"
+        :pageStatus="pageStatus"
+        :formReveal="formReveal"
+        :formTitle="formTitle"
+        :displayDialog="editDialog"
+        :FormData="formReveal ? CreateFormData : editFormData"
+        :Form="formReveal ? CreateForm : editForm"
+        :Options="editOptions"
+        :Handle="editHandle"
+        :Rules="formReveal ? editRules.cerateRule : editRules.editRule"
+        @FormSubmit="FormSubmit"
+        @close="FormClose"
+        @goBack="goBack"
+        @changeSelect="changeSelect"
+      ></newAndEdiDialog>
+      <!-- 搜索按钮——窗体组件 -->
+      <searchPage
+        ref="searchTable"
+        :tableLoading="Loading.autoTableLoading"
+        :advancedFilter="advancedFilter()"
+        :filterPageListParams="filterPageListParams"
+        :formTitle="searchTitle"
+        :displayDialog="displayDialog.AddNewDialog"
+        :searchTableData="searchData"
+        :searchTableColumns="searchColumns"
+        :searchTotalCount="searchTotalCount"
+        :supplierItemPage="searchPageListParams"
+        @handleSelectionChange="prepareFormData"
+        @SizeChange="searchAlterResultCount($event, searchPageListParams)"
+        @CurrentChange="searchAlertoldSkipCount($event, searchPageListParams)"
+        @tableButtonClick="searchSubmit(arguments)"
+      ></searchPage>
+      <!-- 新导入 disabledMethod 导入方式禁用 disabledIsAllowPartImport 是否局部导入禁用-->
+      <!-- methodValue 导入方式默认选项  是否局部导入 默认选项  -->
+      <importFile
+        :loading="Loading.importLoading"
+        :show="displayDialog.importDialog"
+        :disabledMethod = {method1:false,method2:false,method3:false}
+        :disabledIsAllowPartImport = {isAllowPartImport1:false,isAllowPartImport2:false}
+        isAllowPartImportValue="1"
+        @importClick="postImportMergeClick(arguments)"
+        @postImportDown="importDown"
+      ></importFile>
+      <!--抽屉-->
+      <curren-Drawer
+        ref="currenDrawer_Ref"
+        :title="apiColumns_DesTions"
+        @rowDrop="rowDrop"
+        :tableColumns="apiColumns_DetailsTable"
+        :tabsDesTions="apiColumns_DesTions"
+        :DrawerLoading="Loading.DrawerLoading"
+        :drawer="displayDialog.detailsDialog"
+        :Butttondata="[]"
+        :propsData="propsData"
+        @drawerShut="(val) => (displayDialog.detailsDialog = val)"
+        @drawerbutton="drawerbutton"
+        @handleCommand="drawerHandle"
+        @close-value="closeValue"
+        :firstTabs="firstTabs"
+        :totalCount="totalCountDetails"
+        :currentPage="oldSkipCountDetails"
+        :MaxResultCount="MaxResultCountDetails"
+        @alterResultCountDetails="alterResultCountDetails"
+        @alertoldSkipCountDetails="alertoldSkipCountDetails"
+        :buttonOperationList_left="operationButtonsDetail"
+    ></curren-Drawer>
+    </div>
+  </template>
+  <script>
+  import { tableMixins } from "@/mixins/TableMixins"
+  import { LoadingMixins } from "@/mixins/LoadingMixins"
+  import { drawerMixins } from "@/mixins/drawerMixins"
+  import { TableHeaderMixins } from "@/mixins/TableHeaderMixins"
+  import { newAndEdiDialogMixins } from "@/mixins/newAndEdiDialogMixins"
+  import { mixins } from "@/mixins/mixins"
+  import { filterSelectMixins } from '@/mixins/filter-Select'
+  import { zhApiColumnsLable,firstWordSizeChange } from '@/utils/index'
+  import { getPageList } from '@/api/wms-api'
+  import {
+    postCreate,
+    postUpdate,
+  } from "@/api/wms-api"
+  
+  export default {
+    name: "ExportCustomUserSetting",
+    mixins: [
+      tableMixins,
+      LoadingMixins,
+      drawerMixins,
+      TableHeaderMixins,
+      mixins,
+      filterSelectMixins,
+      newAndEdiDialogMixins
+    ],
+    computed: {
+      editDialog: {
+        get: function (val) {
+          return this.displayDialog.newDialog || this.displayDialog.editDialog;
+        },
+      },
+    },
+    watch:{
+      'displayDialog.editDialog'(n){
+        if(n){
+          this.editFormData.exportColumnNameArr = this.editFormData.exportColumnName_old.split(" ")
+          this.getColumList()
+        }
+      }
+    },
+    data () {
+      const userInfo=this.$store.getters.currentUserInfo
+      return {
+        tableLoading:false,
+        //常用按钮数据
+        currenButtonData: [
+          this.defaultAddBtn(),//新增
+          this.defaultFieldSettingBtn(),//字段设置
+          this.defaultFreshBtn(),//刷新
+          this.defaultFilterBtn(),//筛选
+        ],
+        //新增
+        CreateFormData: {
+          customUserSetting: null,
+          exportUserName: userInfo.name,
+          exportUserId: userInfo.id,
+          exportColumnName: null,
+          exportTableName: null,
+          exportColumnNameArr:null,
+          exportTableName_old:null,
+        },
+        //编辑
+        editFormData: {
+          id:null,
+          customUserSetting: null,
+          exportUserName: userInfo.name,
+          exportUserId: userInfo.id,
+          exportColumnName: null,
+          exportTableName: null,
+          exportColumnNameArr:null,
+          exportTableName_old:null,
+          exportColumnName_old:null
+        },
+        editOptions: {},
+        CreateForm: [
+          // { type: "input", label: zhApiColumnsLable('ExportCustomUserSettingCustomUserSetting'), prop: "customUserSetting", colSpan: 12 },
+          // { type: "input", label: zhApiColumnsLable('ExportCustomUserSettingExportColumnName'), prop: "exportColumnName", colSpan: 12 },
+          // { type: "input", label: zhApiColumnsLable('ExportCustomUserSettingExportTableName'), prop: "exportTableName", colSpan: 12 },
+          { type: "select", label: zhApiColumnsLable('ExportCustomUserSettingCustomUserSetting'), prop: "customUserSetting", options: "whetherOrNotForNum", colSpan: 12 },
+          { type: "select", label: zhApiColumnsLable('ExportCustomUserSettingExportTableName'), prop: "exportTableName_old", userOptions: this.initTablesName(), colSpan: 12 },
+          { type: "select", disabled:true, multiple:true, label: zhApiColumnsLable('ExportCustomUserSettingExportColumnName'), prop: "exportColumnNameArr", userOptions:null, colSpan: 12 },
+        ],
+        editForm: [
+          { type: "select", label: zhApiColumnsLable('ExportCustomUserSettingCustomUserSetting'), prop: "customUserSetting", options: "whetherOrNotForNum", colSpan: 12 },
+          { type: "select", label: zhApiColumnsLable('ExportCustomUserSettingExportTableName'), prop: "exportTableName_old", userOptions: this.initTablesName(), colSpan: 12 },
+          { type: "select", multiple:true, label: zhApiColumnsLable('ExportCustomUserSettingExportColumnName'), prop: "exportColumnNameArr", userOptions:null, colSpan: 12 },
+        ],
+        editRules: {
+          cerateRule: {
+            customUserSetting: [{ required: true, trigger: "blur", message: "不可为空" }],
+            exportColumnNameArr: [{ required: true, trigger: "blur", message: "不可为空" }],
+            exportTableName_old: [{ required: true, trigger: "blur", message: "不可为空" }],
+          },
+          editRule: {
+            customUserSetting: [{ required: true, trigger: "blur", message: "不可为空" }],
+            exportColumnNameArr: [{ required: true, trigger: "blur", message: "不可为空" }],
+            exportTableName_old: [{ required: true, trigger: "blur", message: "不可为空" }],
+          }
+        },
+        columsList:[],
+      };
+    },
+    mounted () {
+      this.paging();
+    },
+    methods:{
+      pagingCallback(callback){
+        this.Loading.tableLoading = false
+        this.tableData.forEach(item=>{
+          item.exportTableName_old = item.exportTableName
+          item.exportColumnName_old = item.exportColumnName
+          item.exportTableName = zhApiColumnsLable(item.exportTableName)
+          let _arr = item.exportColumnName.split(" ")
+          let _zhArr = []
+          _arr.forEach(item2=>{
+            let _item2 = zhApiColumnsLable(item.exportTableName_old+firstWordSizeChange(item2,'Upper')) || item2
+            _zhArr.push(_item2)
+          })
+          item.exportColumnName = _zhArr.join(',')
+        })
+        if(callback)callback()
+      },
+      // 新增/编辑的导出表下拉
+      initTablesName(){
+        let _names = this.$store.getters.tablesName
+        let tablesList = []
+        _names.forEach(item=>{
+          let _item = {
+            label:zhApiColumnsLable(item),
+            value:item
+          }
+          tablesList.push(_item)
+        })
+        return tablesList
+      },
+      changeSelect(prop,val){
+        // 获取对应表的表头
+        if(prop=='exportTableName_old'){
+          if(this.formReveal){
+            this.CreateForm[2].disabled = false
+            // this.CreateFormData.exportTableName = this.CreateFormData.exportTableName_old
+            this.CreateFormData.exportColumnNameArr = []
+          }else{
+            this.editForm[2].disabled = false
+            // this.editFormData.exportTableName = this.editFormData.exportTableName_old
+            this.editFormData.exportColumnNameArr = []
+          }
+          this.getColumList()
+        }
+      },
+      getColumList(){
+        let val = this.formReveal ? this.CreateFormData.exportTableName_old : this.editFormData.exportTableName_old
+        getPageList(this.PageListParams, val+'/base').then(res=>{
+          let _column = res.items[0]
+          this.columsList = []
+          for(let item in _column){
+            if(item != 'detail' || item != 'details'){
+              let _item = {
+                label:zhApiColumnsLable(val+firstWordSizeChange(item,'Upper')),
+                value:item
+              }
+              this.columsList.push(_item)
+            }
+          }
+          if(this.formReveal){
+            this.CreateForm[2].userOptions = this.columsList
+          }else{
+            this.editForm[2].userOptions = this.columsList
+          }
+        })
+      },
+      //提交表单
+      FormSubmit(val) {
+        this.ref = val
+        this.Loading.newAndEdiLoading = true
+        let _updata = this.formReveal ? this.URLOption_add : this.URLOption_edit
+        let _url = _updata ? _updata : this.URLOption_base
+        switch (this.formReveal) {
+          case true:
+            this.CreateFormData.exportColumnName = this.CreateFormData.exportColumnNameArr.join(" ")
+            this.CreateFormData.exportTableName = this.CreateFormData.exportTableName_old
+            if(!_updata){_url = _url + '/create'}
+            postCreate(this.CreateFormData, _url).then(res => {
+              this.oldSkipCount = 1;
+              this.Loading.newAndEdiLoading = false
+              this.paging()
+              this.FormResult("success")
+            }).catch(err => {
+              this.Loading.newAndEdiLoading = false
+              this.FormResult("error")
+            })
+            break;
+          case false:
+            if(!_updata){_url = _url + '/update-by-id'}
+            this.editFormData.exportColumnName = this.editFormData.exportColumnNameArr.join(" ")
+            this.editFormData.exportTableName = this.editFormData.exportTableName_old
+            postUpdate(this.editFormData, this.editFormData.id, _url).then(res => {
+              this.propsData = res
+              this.Loading.newAndEdiLoading = false
+              this.paging()
+              this.FormResult("success")
+            }).catch(err => {
+              this.Loading.newAndEdiLoading = false
+              this.FormResult("error")
+            })
+        }
+      },
+    }
+  };
+  </script>
+  <style lang="scss" scoped>
+    @import "@/styles/basicData.scss";
+  </style>
\ No newline at end of file
diff --git a/Code/Fe/src/views/menuList/TestSchool.vue b/Code/Fe/src/views/menuList/TestSchool.vue
index 12b0e77..a0afeb7 100644
--- a/Code/Fe/src/views/menuList/TestSchool.vue
+++ b/Code/Fe/src/views/menuList/TestSchool.vue
@@ -68,6 +68,7 @@
     <addEditFromApiPop
       v-if="displayDialog.addEditApiDialog"
       :handleType="addEditApiType"
+      :editRowData="editFromApiRowData"
       @closePop="closeAddEditApiPop"
     ></addEditFromApiPop>
   </div>