From c288553882bbe94ca57bbce95933e89e5c3937c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com>
Date: Thu, 27 Jul 2023 09:09:31 +0800
Subject: [PATCH] =?UTF-8?q?demo=E9=A1=B5=E9=9D=A2=E6=95=B4=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Code/Fe/src/views/demo/demo_base_handle.vue   | 196 ++++++++
 .../demo_mst_det.vue}                         |  44 +-
 Code/Fe/src/views/demo/demo_read.vue          |  79 +++
 .../views/interfaceBoard/TestSchool_all.vue   | 466 ------------------
 .../TestSchool.vue                            |   0
 5 files changed, 297 insertions(+), 488 deletions(-)
 create mode 100644 Code/Fe/src/views/demo/demo_base_handle.vue
 rename Code/Fe/src/views/{interfaceBoard/TestSchool_read.vue => demo/demo_mst_det.vue} (70%)
 create mode 100644 Code/Fe/src/views/demo/demo_read.vue
 delete mode 100644 Code/Fe/src/views/interfaceBoard/TestSchool_all.vue
 rename Code/Fe/src/views/{interfaceBoard => menuList}/TestSchool.vue (100%)

diff --git a/Code/Fe/src/views/demo/demo_base_handle.vue b/Code/Fe/src/views/demo/demo_base_handle.vue
new file mode 100644
index 0000000..be6a0fc
--- /dev/null
+++ b/Code/Fe/src/views/demo/demo_base_handle.vue
@@ -0,0 +1,196 @@
+
+<template>
+    <div class="page-box" v-loading="Loading.appMainLoading">
+      <!-- DEMO:只有主表 基础的主表增删改查 -->
+      <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_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"
+      ></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"
+        :propsData="propsData"
+        :dropdownData="dropdownData"
+        @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 } from '@/utils/index'
+  
+  export default {
+    name: "ExportCustomUserSetting",
+    mixins: [
+      tableMixins,
+      LoadingMixins,
+      drawerMixins,
+      TableHeaderMixins,
+      mixins,
+      filterSelectMixins,
+      newAndEdiDialogMixins
+    ],
+    computed: {
+      editDialog: {
+        get: function () {
+          return this.displayDialog.newDialog || this.displayDialog.editDialog;
+        },
+      },
+    },
+    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,
+        },
+        //编辑
+        editFormData: {
+            customUserSetting: null,
+            exportUserName: userInfo.name,
+            exportUserId: userInfo.id,
+            exportColumnName: null,
+            exportTableName: 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 },
+        ],
+        editForm: [
+          { 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 },
+        ],
+        editRules: {
+          cerateRule: {
+            customUserSetting: [{ required: true, trigger: "blur", message: "不可为空" }],
+            exportColumnName: [{ required: true, trigger: "blur", message: "不可为空" }],
+            exportTableName: [{ required: true, trigger: "blur", message: "不可为空" }],
+          },
+          editRule: {
+            customUserSetting: [{ required: true, trigger: "blur", message: "不可为空" }],
+            exportColumnName: [{ required: true, trigger: "blur", message: "不可为空" }],
+            exportTableName: [{ required: true, trigger: "blur", message: "不可为空" }],
+          }
+        },
+      };
+    },
+    mounted () {
+      this.paging();
+    },
+  };
+  </script>
+  <style lang="scss" scoped>
+    @import "@/styles/basicData.scss";
+  </style>
\ No newline at end of file
diff --git a/Code/Fe/src/views/interfaceBoard/TestSchool_read.vue b/Code/Fe/src/views/demo/demo_mst_det.vue
similarity index 70%
rename from Code/Fe/src/views/interfaceBoard/TestSchool_read.vue
rename to Code/Fe/src/views/demo/demo_mst_det.vue
index 2dd946f..da7748b 100644
--- a/Code/Fe/src/views/interfaceBoard/TestSchool_read.vue
+++ b/Code/Fe/src/views/demo/demo_mst_det.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="page-box" v-loading="Loading.appMainLoading">
-    <!-- 只读样本 -->
+    <!-- DEMO:带主子表查询 没有新增编辑删除 -->
     <tablePagination
       v-if="apiColumns_Table"
       :currenButtonData="currenButtonData"
@@ -24,15 +24,19 @@
       :primarySearchOption="primarySearchOption"
       @overallSearchFormClick="overallSearchFormClick"
       :httpOverallSearchData="httpOverallSearchData"
+      :buttonOperationList_left="buttonOperationClick_leftBase"
+      @buttonOperationClick_left="buttonOperationClick_left"
     ></tablePagination>
     <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"
+      :Butttondata="[]"
       @drawerShut="(val) => (displayDialog.detailsDialog = val)"
       @drawerbutton="drawerbutton"
       @handleCommand="drawerHandle"
@@ -42,15 +46,20 @@
       :MaxResultCount="MaxResultCountDetails"
       @alterResultCountDetails="alterResultCountDetails"
       @alertoldSkipCountDetails="alertoldSkipCountDetails"
+      :buttonOperationList_left="operationButtonsDetail"
     ></curren-Drawer>
+    <!-- 明细查询页面 -->
     <filterForDetailPage
       v-if="filterForDetailShow"
-      :listColumns="apiColumns_DetailsTable"
       :parentColumns="apiColumns_Table"
       @closeDialog="changeFilterForDetailShow"
     ></filterForDetailPage>
-    <!-- DeleteApi="TestSchoolDetailList_delete" -->
-    <!-- todo: 明细查询中的parentColumns 是否需要独立表头，现与列表页面一致-->
+    <!-- 导出弹窗 -->
+    <exportDrop 
+      v-if="displayDialog.exportDialog"
+      @closeDialog="closeExportDrop"
+      @exportDropSubmit="exportDropSubmit"
+    ></exportDrop>
   </div>
 </template>
 <script>
@@ -58,17 +67,17 @@ 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 { getToken } from '@/utils/auth'
-import  * as tableColumns_api from "@/utils/tableColumns_api/index" //全局从接口缓存的表头
-import  * as tabsDesTions_api from "@/utils/tabsDesTions_api/index" //全局从接口缓存的详情
-import  * as detailsTableColumns_api from "@/utils/detailsTableColumns_api/index" //全局从接口缓存的详情
+// import  * as tableColumns_api from "@/utils/tableColumns_api/index" //全局从接口缓存的表头
+// import  * as tabsDesTions_api from "@/utils/tabsDesTions_api/index" //全局从接口缓存的详情
+// import  * as detailsTableColumns_api from "@/utils/detailsTableColumns_api/index" //全局从接口缓存的列表-明细
+// import  * as detailsPageColumns_api from "@/utils/detailsPageColumns_api/index" //全局从接口缓存的明细列表
 
 
 export default {
-  name: "TestSchool",
+  name: "AsnMstr",
   mixins: [
     tableMixins,
     LoadingMixins,
@@ -76,7 +85,6 @@ export default {
     TableHeaderMixins,
     mixins,
     filterSelectMixins,
-    newAndEdiDialogMixins
   ],
   data() {
     return {
@@ -86,26 +94,18 @@ export default {
           isRedundance:true,
           isDetailExport:true
         }),//导出
+        this.defaultFieldSettingBtn(),//字段设置
         this.defaultFreshBtn(),//刷新
         this.defaultFilterBtn(),//筛选
         this.defaultFilterForDetailBtn()//明细查询按钮
       ],
-      // 明细查询弹窗显示
-      filterForDetailShow:false,
     };
   },
   mounted() {
-    this.initApiColumns()
+    // 如果使用动态api(全局进入时候获取情况)
+    // this.initApiColumns(tableColumns_api,tabsDesTions_api,detailsTableColumns_api,detailsPageColumns_api)
     this.paging();
   },
-  methods: {
-    // 获取通过api的表头数据，不可以在初始化处理，因为接口返回问题
-    initApiColumns(){
-      this.apiColumns_Table = tableColumns_api[this.$route.name]
-      this.apiColumns_DesTions = tabsDesTions_api[this.$route.name]
-      this.apiColumns_DetailsTable = detailsTableColumns_api[this.$route.name]
-    },
-  }
 }
 </script>
 <style lang="scss" scoped>
diff --git a/Code/Fe/src/views/demo/demo_read.vue b/Code/Fe/src/views/demo/demo_read.vue
new file mode 100644
index 0000000..833b263
--- /dev/null
+++ b/Code/Fe/src/views/demo/demo_read.vue
@@ -0,0 +1,79 @@
+<template>
+  <div class="page-box" v-loading="Loading.appMainLoading">
+    <!-- DEMO:只有主表查询 没有新增编辑删除 -->
+    <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"
+    ></tablePagination>
+    <!-- 导出弹窗 -->
+    <exportDrop 
+      v-if="displayDialog.exportDialog"
+      @closeDialog="closeExportDrop"
+      @exportDropSubmit="exportDropSubmit"
+    ></exportDrop>
+  </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 { getToken } from '@/utils/auth'
+
+
+export default {
+  name: "IncomingData",
+  mixins: [
+    tableMixins,
+    LoadingMixins,
+    drawerMixins,
+    TableHeaderMixins,
+    mixins,
+    filterSelectMixins,
+    newAndEdiDialogMixins
+  ],
+  data() {
+    return {
+      //常用按钮数据
+      currenButtonData: [
+        this.defaultExportBtn({
+          isRedundance:true,
+          isDetailExport:true
+        }),//导出
+        this.defaultFieldSettingBtn(),//字段设置
+        this.defaultFreshBtn(),//刷新
+        this.defaultFilterBtn(),//筛选
+      ],
+    };
+  },
+  mounted() {
+    this.paging();
+  },
+}
+</script>
+<style lang="scss" scoped>
+@import "@/styles/basicData.scss";
+</style>
\ No newline at end of file
diff --git a/Code/Fe/src/views/interfaceBoard/TestSchool_all.vue b/Code/Fe/src/views/interfaceBoard/TestSchool_all.vue
deleted file mode 100644
index fd50f68..0000000
--- a/Code/Fe/src/views/interfaceBoard/TestSchool_all.vue
+++ /dev/null
@@ -1,466 +0,0 @@
-<template>
-  <div class="page-box" v-loading="Loading.appMainLoading">
-    <tablePagination
-      :currenButtonData="currenButtonData"
-      :tableData="tableData"
-      :tableLoading="Loading.tableLoading"
-      :tableColumns="apiColumns_Table"
-      @rowDrop="rowDrop"
-      :totalCount="totalCount"
-      :multipleSelection="multipleSelection"
-      :MaxResultCount="PageListParams.MaxResultCount"
-      @topbutton="customTopbutton"
-      @inlineDialog="inlineDialog"
-      @sortChange="sortChange"
-      @alertoldSkipCount="alertoldSkipCount"
-      @alterResultCount="alterResultCount"
-      @handleSelectionChange="handleSelectionChange"
-      :currentPageProps="oldSkipCount"
-      :quicklySearchOption="quicklySearchOption"
-      @quicklySearchClick="quicklySearchClick"
-      @quicklySearchClear="quicklySearchClear"
-      :primarySearchOption="primarySearchOption"
-      @overallSearchFormClick="overallSearchFormClick"
-      :httpOverallSearchData="httpOverallSearchData"
-    ></tablePagination>
-    <!-- 新增与编辑 -->
-    <newAndEdiDialogForDetail
-      v-if="apiColumns_DetailsTable"
-      ref="newAndEdiDialogForDetail"
-      :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"
-      :flexTableColumns="flexTableColumns"
-    ></newAndEdiDialogForDetail>
-    <curren-Drawer
-      :title="apiColumns_DesTions"
-      :tableColumns="apiColumns_DetailsTable"
-      :tabsDesTions="apiColumns_DesTions"
-      :DrawerLoading="Loading.DrawerLoading"
-      :drawer="displayDialog.detailsDialog"
-      :dropdownData="dropdownData"
-      :propsData="propsData"
-      @drawerShut="(val) => (displayDialog.detailsDialog = val)"
-      @drawerbutton="drawerbutton"
-      @handleCommand="drawerHandle"
-      @close-value="closeValue"
-      :totalCount="totalCountDetails"
-      :currentPage="oldSkipCountDetails"
-      :MaxResultCount="MaxResultCountDetails"
-      @alterResultCountDetails="alterResultCountDetails"
-      @alertoldSkipCountDetails="alertoldSkipCountDetails"
-    >
-      <!-- 明细中的删除示例 （但是明细应该只读，删除及新增编辑在明细查询中处理，所以暂隐藏） -->
-      <!-- <template v-if="currentTagName == 'mx' ">
-        <el-table-column
-          label="操作"
-          :align="'center'"
-          width="100"
-        >
-          <template slot-scope="scope">
-            <el-popover
-              placement="left"
-              width="260"
-              v-model="scope.row.deleteTipVisible"
-            >
-              <p>此操作将永久删除该消息, 是否继续?</p>
-              <div style="text-align: right; margin: 0">
-                  <el-button size="mini" type="text" style="margin-right: 20px;" @click="scope.row.deleteTipVisible = false">取消</el-button>
-                  <el-button type="primary" size="mini" @click="deleteHandleForDetail(scope.row)">确定</el-button>
-              </div>
-              <el-button type="text" slot="reference" style="color: red;">删除</el-button>
-            </el-popover>
-          </template>
-        </el-table-column>
-      </template>		 -->
-    </curren-Drawer>
-    <filterForDetailPage
-      v-if="filterForDetailShow"
-      ref="filterForDetailPage"
-      listApi="TestSchoolDetailList"
-      DeleteApi="TestSchoolDetailList_delete"
-      :listColumns="apiColumns_DetailsTable"
-      @closeDialog="changeFilterForDetailShow"
-    ></filterForDetailPage>
-  </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 { TestSchool,TestSchool_save,TestSchoolItemById,TestSchool_delete,TestSchoolDetailList_delete } from "@/api/wms-interface"
-import { getToken } from '@/utils/auth'
-
-export default {
-  name: "TestSchool",
-  mixins: [
-    tableMixins,
-    LoadingMixins,
-    drawerMixins,
-    TableHeaderMixins,
-    mixins,
-    filterSelectMixins,
-    newAndEdiDialogMixins
-  ],
-  computed: {
-    editDialog: {
-      get: function () {
-        return this.displayDialog.newDialog || this.displayDialog.editDialog;
-      },
-    },
-  },
-  data() {
-    // let _Dashboard = JSON.parse(localStorage.getItem("interfaceBoardColumnsNames")) // 接口监控看板
-    return {
-      currentTagName:'mx',
-      //常用按钮数据
-      currenButtonData: [
-        this.defaultAddBtn(),//新增
-        this.defaultExportBtn(),//导出
-        this.defaultFieldSettingBtn(),//字段设置
-        this.defaultFreshBtn(),//刷新
-        this.defaultFilterBtn(),//筛选
-        this.defaultFilterForDetailBtn()//明细查询按钮
-      ],
-      flexTableColumns:[
-        { label: "学生33", prop: "studentName", width:"auto", type:"input" },
-        { label: "orderType33", prop: "orderType", width:"auto" },
-        { label: "创建时间33", prop: "creationTime", type: "dateTime", width:"auto" },
-      ],
-      //新增
-      CreateFormData: {
-        schoolName:null,
-        orderType:null,
-        details:null,
-        // details: [
-        //   {
-        //       "lastModifierId": "ad731144-d789-f322-fede-327cac55dd36",
-        //       "creationTime": "1978-07-18T22:00:37.5Z",
-        //       "creatorId": "19e78d1b-6203-8d6d-b6e7-ae5b503c0824",
-        //       "id": "5926ec25-2132-ba25-6b93-e453c17f00e2",
-        //       "studentName": "张三",
-        //       "orderType": 2,
-        //       "masterId": "a044e2c6-3bc6-7cdd-55a6-f1a2a9682ccb",
-        //       "lastModificationTime": "1946-12-30T14:22:31.982Z"
-        //   },
-        // ],
-        // number: null,//数字+点*
-        // remark: null,
-        // dataType: null,
-        // tableType: null,//数字+点*
-        // dataAction: null,//数字+点*
-        // effectiveDate: null,//*
-        // status: null,//数字+点*
-        // sourceSystem: null,
-        // sourceDataId: null,
-        // sourceDataGroupCode: null,
-        // sourceDataDetailCode: null,
-        // sourceDataContent: null,
-        // writeTime: null,//*
-        // writer: null,
-        // destinationSystem: null,
-        // destinationDataId: null,
-        // destinationDataContent: null,
-        // readTime: null,//*
-        // reader: null,
-        // errorCode: null,//数字+点*
-        // errorMessage: null,
-        // retryTimes: null,//数字+点*
-      },
-      //编辑
-      editFormData: {
-        id:null,
-        schoolName:null,
-        orderType:null,
-        details:null,
-        // number: null,//数字+点*
-        // remark: null,
-        // dataType: null,
-        // tableType: null,//数字+点*
-        // dataAction: null,//数字+点*
-        // effectiveDate: null,//*
-        // status: null,//数字+点*
-        // sourceSystem: null,
-        // sourceDataId: null,
-        // sourceDataGroupCode: null,
-        // sourceDataDetailCode: null,
-        // sourceDataContent: null,
-        // writeTime: null,//*
-        // writer: null,
-        // destinationSystem: null,
-        // destinationDataId: null,
-        // destinationDataContent: null,
-        // readTime: null,//*
-        // reader: null,
-        // errorCode: null,//数字+点*
-        // errorMessage: null,
-        // retryTimes: null,//数字+点*
-      },
-      CreateForm: [
-        { type: "input", label: '名称', prop: 'schoolName', colSpan: 12 },
-        { type: "input", label: 'orderType', prop: 'orderType', colSpan: 12 },
-        // { type: "input", label: _Dashboard.OutgoingToExternalDataType, prop: 'dataType', colSpan: 12, },
-        // { type: "input", label: _Dashboard.OutgoingToExternalTableType, prop: 'tableType', colSpan: 12, validType:'pointNumber' },
-        // { type: "input", label: _Dashboard.OutgoingToExternalDataAction, prop: 'dataAction', colSpan: 12, validType:'pointNumber' },
-        // { type: "dateTime", label: _Dashboard.OutgoingToExternalEffectiveDate, prop: 'effectiveDate', colSpan: 12, },
-        // { type: "input", label: _Dashboard.OutgoingToExternalStatus, prop: 'status', colSpan: 12, validType:'pointNumber' },
-        // { type: "input", label: _Dashboard.OutgoingToExternalSourceSystem, prop: 'sourceSystem', colSpan: 12, },
-        // { type: "input", label: _Dashboard.OutgoingToExternalSourceDataId, prop: 'sourceDataId', colSpan: 12, },
-        // { type: "input", label: _Dashboard.OutgoingToExternalSourceDataGroupCode, prop: 'sourceDataGroupCode', colSpan: 12, },
-        // { type: "input", label: _Dashboard.OutgoingToExternalSourceDataDetailCode, prop: 'sourceDataDetailCode', colSpan: 12, },
-        // { type: "input", label: _Dashboard.OutgoingToExternalSourceDataContent, prop: 'sourceDataContent', colSpan: 12, },
-        // { type: "dateTime", label: _Dashboard.OutgoingToExternalWriteTime, prop: 'writeTime', colSpan: 12, },
-        // { type: "input", label: _Dashboard.OutgoingToExternalWriter, prop: 'writer', colSpan: 12, },
-        // { type: "input", label: _Dashboard.OutgoingToExternalDestinationSystem, prop: 'destinationSystem', colSpan: 12, },
-        // { type: "input", label: _Dashboard.OutgoingToExternalDestinationDataId, prop: 'destinationDataId', colSpan: 12, },
-        // { type: "input", label: _Dashboard.OutgoingToExternalDestinationDataContent, prop: 'destinationDataContent', colSpan: 12, },
-        // { type: "dateTime", label: _Dashboard.OutgoingToExternalReadTime, prop: 'readTime', colSpan: 12, },
-        // { type: "input", label: _Dashboard.OutgoingToExternalReader, prop: 'reader', colSpan: 12, },
-        // { type: "input", label: _Dashboard.OutgoingToExternalErrorCode, prop: 'errorCode', colSpan: 12, validType:'pointNumber' },
-        // { type: "input", label: _Dashboard.OutgoingToExternalErrorMessage, prop: 'errorMessage', colSpan: 12, },
-        // { type: "input", label: _Dashboard.OutgoingToExternalRetryTimes, prop: 'retryTimes', colSpan: 12, validType:'pointNumber'},
-      ],
-      editForm: [
-        { type: "input", label: '名称', prop: 'schoolName', colSpan: 12 },
-        { type: "input", label: 'orderType', prop: 'orderType', colSpan: 12 },
-        // { type: "input", label: _Dashboard.OutgoingToExternalNumber, prop: 'number', colSpan: 12, validType:'pointNumber' },
-        // { type: "input", label: _Dashboard.OutgoingToExternalRemark, prop: 'remark', colSpan: 12, },
-        // { type: "input", label: _Dashboard.OutgoingToExternalDataType, prop: 'dataType', colSpan: 12, },
-        // { type: "input", label: _Dashboard.OutgoingToExternalTableType, prop: 'tableType', colSpan: 12, validType:'pointNumber' },
-        // { type: "input", label: _Dashboard.OutgoingToExternalDataAction, prop: 'dataAction', colSpan: 12, validType:'pointNumber' },
-        // { type: "dateTime", label: _Dashboard.OutgoingToExternalEffectiveDate, prop: 'effectiveDate', colSpan: 12, },
-        // { type: "input", label: _Dashboard.OutgoingToExternalStatus, prop: 'status', colSpan: 12, validType:'pointNumber' },
-        // { type: "input", label: _Dashboard.OutgoingToExternalSourceSystem, prop: 'sourceSystem', colSpan: 12, },
-        // { type: "input", label: _Dashboard.OutgoingToExternalSourceDataId, prop: 'sourceDataId', colSpan: 12, },
-        // { type: "input", label: _Dashboard.OutgoingToExternalSourceDataGroupCode, prop: 'sourceDataGroupCode', colSpan: 12, },
-        // { type: "input", label: _Dashboard.OutgoingToExternalSourceDataDetailCode, prop: 'sourceDataDetailCode', colSpan: 12, },
-        // { type: "input", label: _Dashboard.OutgoingToExternalSourceDataContent, prop: 'sourceDataContent', colSpan: 12, },
-        // { type: "dateTime", label: _Dashboard.OutgoingToExternalWriteTime, prop: 'writeTime', colSpan: 12, },
-        // { type: "input", label: _Dashboard.OutgoingToExternalWriter, prop: 'writer', colSpan: 12, },
-        // { type: "input", label: _Dashboard.OutgoingToExternalDestinationSystem, prop: 'destinationSystem', colSpan: 12, },
-        // { type: "input", label: _Dashboard.OutgoingToExternalDestinationDataId, prop: 'destinationDataId', colSpan: 12, },
-        // { type: "input", label: _Dashboard.OutgoingToExternalDestinationDataContent, prop: 'destinationDataContent', colSpan: 12, },
-        // { type: "dateTime", label: _Dashboard.OutgoingToExternalReadTime, prop: 'readTime', colSpan: 12, },
-        // { type: "input", label: _Dashboard.OutgoingToExternalReader, prop: 'reader', colSpan: 12, },
-        // { type: "input", label: _Dashboard.OutgoingToExternalErrorCode, prop: 'errorCode', colSpan: 12, validType:'pointNumber' },
-        // { type: "input", label: _Dashboard.OutgoingToExternalErrorMessage, prop: 'errorMessage', colSpan: 12, },
-        // { type: "input", label: _Dashboard.OutgoingToExternalRetryTimes, prop: 'retryTimes', colSpan: 12, validType:'pointNumber'},
-      ],
-      editOptions: {},
-      editRules: {
-        cerateRule: {
-          schoolName: [{ required: true, trigger: "blur", message: "不可为空" }],
-          // number: [{ required: true, trigger: "blur", message: "不可为空" }],
-          // tableType: [{ required: true, trigger: "blur", message: "不可为空" }],
-          // dataAction: [{ required: true, trigger: "blur", message: "不可为空" }],
-          // effectiveDate: [{ required: true, trigger: "blur", message: "不可为空" }],
-          // status: [{ required: true, trigger: "blur", message: "不可为空" }],
-          // writeTime: [{ required: true, trigger: "blur", message: "不可为空" }],
-          // readTime: [{ required: true, trigger: "blur", message: "不可为空" }],
-          // errorCode: [{ required: true, trigger: "blur", message: "不可为空" }],
-          // retryTimes: [{ required: true, trigger: "blur", message: "不可为空" }],
-        },
-        editRule: {
-          schoolName: [{ required: true, trigger: "blur", message: "不可为空" }],
-          // number: [{ required: true, trigger: "blur", message: "不可为空" }],
-          // tableType: [{ required: true, trigger: "blur", message: "不可为空" }],
-          // dataAction: [{ required: true, trigger: "blur", message: "不可为空" }],
-          // effectiveDate: [{ required: true, trigger: "blur", message: "不可为空" }],
-          // status: [{ required: true, trigger: "blur", message: "不可为空" }],
-          // writeTime: [{ required: true, trigger: "blur", message: "不可为空" }],
-          // readTime: [{ required: true, trigger: "blur", message: "不可为空" }],
-          // errorCode: [{ required: true, trigger: "blur", message: "不可为空" }],
-          // retryTimes: [{ required: true, trigger: "blur", message: "不可为空" }],
-        }
-      },
-      // 明细查询弹窗显示
-      filterForDetailShow:false,
-      currentDetailId:null,//当前删除主表id,用于删除后重新刷新子表
-    };
-  },
-  mounted() {
-    this.initApiColumns()
-    this.paging();
-  },
-  methods: {
-    //渲染数据
-    // paging(callback) {
-    //   this.Loading.tableLoading = true;
-    //   // this.apiColumns_Table = tableColumns_api[this.$route.name]
-    //   // this.apiColumns_DesTions = tabsDesTions_api[this.$route.name]
-    //   // this.apiColumns_DetailsTable = detailsTableColumns_api[this.$route.name]
-    //   this.PageListParams.SkipCount = (this.oldSkipCount - 1) * this.PageListParams.MaxResultCount
-    //   TestSchool(this.PageListParams,true)
-    //     .then(result => {
-    //       this.tableData = result.items
-    //       this.totalCount = result.totalCount
-    //       this.pagingCallback(callback)
-    //     })
-    //     .catch(err => {
-    //       this.Loading.tableLoading = false
-    //       this.$message.error("数据获取失败")
-    //     })
-    // },
-    //打开抽屉
-    inlineDialog(val) {
-      this.Loading.DrawerLoading = true
-      this.displayDialog.detailsDialog = true;
-      this.currentDetailId = val.id
-      // TestSchoolItemById(val.id)
-      //   .then(res => {
-      //     if (res.details) {
-      //       // 前端分页处理
-      //       this.tableDataDetails = JSON.parse(JSON.stringify(res))
-      //       let linshiTableDataDetails = JSON.parse(JSON.stringify(this.tableDataDetails))
-      //       this.totalCountDetails = res.details.length
-      //       this.propsData = linshiTableDataDetails
-      //       // 删除除当前页面最大数以外数据
-      //       linshiTableDataDetails.details.splice(this.MaxResultCountDetails,this.totalCountDetails); 
-      //     } else {
-      //       this.propsData = res
-      //     }
-      //     this.inlineDialogCallback()
-      //   })
-      //   .catch(err => {
-      //     this.Loading.DrawerLoading = false
-      //     this.$message.error("数据获取失败")
-      //   })
-    },
-    // 新增/编辑提交 todo:编辑报错
-    FormSubmit(val){
-      this.Loading.tableLoading = true
-      let _data = this.formReveal ? this.CreateFormData : this.editFormData
-      // if(!this.formReveal){
-      //   _data.details= [
-      //     {
-      //       "lastModifierId": "ad731144-d789-f322-fede-327cac55dd36",
-      //       "creationTime": "1978-07-18T22:00:37.5Z",
-      //       "creatorId": "19e78d1b-6203-8d6d-b6e7-ae5b503c0824",
-      //       "id": "5926ec25-2132-ba25-6b93-e453c17f00e2",
-      //       "studentName": "张三2",
-      //       "orderType": 32,
-      //       "masterId": "a044e2c6-3bc6-7cdd-55a6-f1a2a9682ccb",
-      //       "lastModificationTime": "1946-12-30T14:22:31.982Z"
-      //     },
-      //     {
-      //       "orderType": 4,
-      //       "id": "b1d829d2-f3c2-9584-5b91-5ce64eea194a",
-      //       "masterId": "f789a9ef-ffbe-f690-fc49-b87d57093b5c",
-      //       "lastModificationTime": null,
-      //       "creationTime": "2010-07-21T09:46:13.372Z",
-      //       "creatorId": null,
-      //       "studentName": "李四",
-      //       "lastModifierId": null
-      //     },
-      //   ]
-      // }
-      // TestSchool_save(_data,this.formReveal)
-      //   .then(result => {
-      //     this.FormResult("success")
-      //     this.Loading.tableLoading = false
-      //   })
-      //   .catch(err => {
-      //     this.FormResult("error")
-      //     this.Loading.tableLoading = false
-      //   })
-      // const _data = new URLSearchParams();
-      // for(let item in this.CreateFormData){
-      //   _data.append('ViewModel.'+item.slice(0,1).toUpperCase() +item.slice(1).toLowerCase(), this.CreateFormData[item])
-      // }
-      // // todo:1、接口302  2、token取值的问题
-      // _data.append('__RequestVerificationToken',getToken())
-      // // this.formReveal为真是新增
-      // TestSchool_save(_data,this.formReveal)
-      //   .then(result => {
-      //     this.Loading.tableLoading = false
-      //   })
-      //   .catch(err => {
-      //       this.Loading.tableLoading = false
-      //   })
-    },
-    // FormSubmit(val){
-    //   this.Loading.tableLoading = true
-    //   const _data = new URLSearchParams();
-    //   for(let item in this.CreateFormData){
-    //     _data.append('ViewModel.'+item.slice(0,1).toUpperCase() +item.slice(1).toLowerCase(), this.CreateFormData[item])
-    //   }
-    //   // todo:1、接口302  2、token取值的问题
-    //   _data.append('__RequestVerificationToken',getToken())
-    //   // this.formReveal为真是新增
-    //   TestSchool_save(_data,this.formReveal)
-    //     .then(result => {
-    //       this.Loading.tableLoading = false
-    //     })
-    //     .catch(err => {
-    //         this.Loading.tableLoading = false
-    //     })
-    // },
-    // 重载抽屉 删除按钮
-    drawerHandle(val) {
-      if (val == 'delete') {
-        this.$confirm('此操作将永久删除该消息, 是否继续?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          this.Loading.appMainLoading = true
-          this.displayDialog.detailsDialog = false
-          // todo:1、接口302
-          // TestSchool_delete(this.propsData.id).then(res => {
-          //   this.$successMsg('删除成功!')
-          //   this.Loading.appMainLoading = false
-          //   this.paging()
-          // }).catch(err => {
-          //   this.Loading.appMainLoading = false
-          //   this.$message.error("删除失败!")
-          // })
-        }).catch(() => {
-          //取消操作
-        });
-      }
-    },
-    changeFilterForDetailShow(data){
-      this.filterForDetailShow = data
-    },
-    customTopbutton(val,item){
-      // 明细筛选按钮
-      if(val == 'filterForDetail'){
-        this.changeFilterForDetailShow(true)
-      }else{
-        this.topbutton(val,item)
-      }
-    },
-    deleteHandleForDetail(data){
-      this.Loading.appMainLoading = true
-      data.deleteTipVisible = false
-      // TestSchoolDetailList_delete(data.id).then(res => {
-      //   this.$successMsg('删除成功!')
-      //   this.Loading.appMainLoading = false
-      //   this.oldSkipCountDetails = 1
-      //   this.inlineDialog({id:this.currentDetailId})
-      // }).catch(err => {
-      //   this.Loading.appMainLoading = false
-      //   this.$message.error("删除失败!")
-      // })
-    },
-  }
-}
-</script>
-<style lang="scss" scoped>
-@import "@/styles/basicData.scss";
-</style>
\ No newline at end of file
diff --git a/Code/Fe/src/views/interfaceBoard/TestSchool.vue b/Code/Fe/src/views/menuList/TestSchool.vue
similarity index 100%
rename from Code/Fe/src/views/interfaceBoard/TestSchool.vue
rename to Code/Fe/src/views/menuList/TestSchool.vue