diff --git a/PC/InterFace.Dash/package-lock.json b/PC/InterFace.Dash/package-lock.json
index b32b900..ebe7119 100644
--- a/PC/InterFace.Dash/package-lock.json
+++ b/PC/InterFace.Dash/package-lock.json
@@ -10,6 +10,8 @@
       "license": "MIT",
       "dependencies": {
         "af-table-column": "^1.0.3",
+        "ag-grid-community": "^30.2.1",
+        "ag-grid-vue": "^30.2.1",
         "axios": "0.18.1",
         "clipboard": "2.0.4",
         "codemirror": "5.45.0",
@@ -42,6 +44,7 @@
         "vue-grid-layout": "^2.4.0",
         "vue-i18n": "^8.28.2",
         "vue-pdf": "^4.3.0",
+        "vue-property-decorator": "^8.0.0",
         "vue-router": "3.0.2",
         "vue-splitpane": "1.0.4",
         "vuedraggable": "2.20.0",
@@ -3851,6 +3854,21 @@
         "vue": "^2.6.10"
       }
     },
+    "node_modules/ag-grid-community": {
+      "version": "30.2.1",
+      "resolved": "https://registry.npmmirror.com/ag-grid-community/-/ag-grid-community-30.2.1.tgz",
+      "integrity": "sha512-1slonXskJbbI9ybhTx//4YKfJpZVAEnHL8dui1rQJRSXKByUi+/f7XtvkLsbgBkawoWbqvRAySjYtvz80+kBfA=="
+    },
+    "node_modules/ag-grid-vue": {
+      "version": "30.2.1",
+      "resolved": "https://registry.npmmirror.com/ag-grid-vue/-/ag-grid-vue-30.2.1.tgz",
+      "integrity": "sha512-dnyltXrVUPk0ALQ1PfwnjBtYk/GDOjRjyOMy8LVAiWxVQA6Tmnb/dTnS1yjym1uggu+dDKof2zgPxVKayIHtWg==",
+      "peerDependencies": {
+        "ag-grid-community": "~30.2.1",
+        "vue": ">= 2.2 <= 2.5.17 || >= 2.5.20",
+        "vue-property-decorator": "^7.2.0 || ^8.0.0 || ^9.1.2"
+      }
+    },
     "node_modules/aggregate-error": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz",
@@ -22377,6 +22395,22 @@
         "url": "https://opencollective.com/webpack"
       }
     },
+    "node_modules/vue-property-decorator": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmmirror.com/vue-property-decorator/-/vue-property-decorator-8.0.0.tgz",
+      "integrity": "sha512-aaAO/Wbh+n3sPMOoQ+Rwi9va6vFqZPX13dA8vMycGuS/DOIYC77KxX0gMAPEzzkT4Umya0uSlTvBV5jQvSTyBQ==",
+      "dependencies": {
+        "vue-class-component": "^7.0.1"
+      }
+    },
+    "node_modules/vue-property-decorator/node_modules/vue-class-component": {
+      "version": "7.2.6",
+      "resolved": "https://registry.npmmirror.com/vue-class-component/-/vue-class-component-7.2.6.tgz",
+      "integrity": "sha512-+eaQXVrAm/LldalI272PpDe3+i4mPis0ORiMYxF6Ae4hyuCh15W8Idet7wPUEs4N4YptgFHGys4UrgNQOMyO6w==",
+      "peerDependencies": {
+        "vue": "^2.0.0"
+      }
+    },
     "node_modules/vue-resize-sensor": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/vue-resize-sensor/-/vue-resize-sensor-2.0.0.tgz",
@@ -26653,6 +26687,17 @@
         "vue": "^2.6.10"
       }
     },
+    "ag-grid-community": {
+      "version": "30.2.1",
+      "resolved": "https://registry.npmmirror.com/ag-grid-community/-/ag-grid-community-30.2.1.tgz",
+      "integrity": "sha512-1slonXskJbbI9ybhTx//4YKfJpZVAEnHL8dui1rQJRSXKByUi+/f7XtvkLsbgBkawoWbqvRAySjYtvz80+kBfA=="
+    },
+    "ag-grid-vue": {
+      "version": "30.2.1",
+      "resolved": "https://registry.npmmirror.com/ag-grid-vue/-/ag-grid-vue-30.2.1.tgz",
+      "integrity": "sha512-dnyltXrVUPk0ALQ1PfwnjBtYk/GDOjRjyOMy8LVAiWxVQA6Tmnb/dTnS1yjym1uggu+dDKof2zgPxVKayIHtWg==",
+      "requires": {}
+    },
     "aggregate-error": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz",
@@ -41525,6 +41570,22 @@
         }
       }
     },
+    "vue-property-decorator": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmmirror.com/vue-property-decorator/-/vue-property-decorator-8.0.0.tgz",
+      "integrity": "sha512-aaAO/Wbh+n3sPMOoQ+Rwi9va6vFqZPX13dA8vMycGuS/DOIYC77KxX0gMAPEzzkT4Umya0uSlTvBV5jQvSTyBQ==",
+      "requires": {
+        "vue-class-component": "^7.0.1"
+      },
+      "dependencies": {
+        "vue-class-component": {
+          "version": "7.2.6",
+          "resolved": "https://registry.npmmirror.com/vue-class-component/-/vue-class-component-7.2.6.tgz",
+          "integrity": "sha512-+eaQXVrAm/LldalI272PpDe3+i4mPis0ORiMYxF6Ae4hyuCh15W8Idet7wPUEs4N4YptgFHGys4UrgNQOMyO6w==",
+          "requires": {}
+        }
+      }
+    },
     "vue-resize-sensor": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/vue-resize-sensor/-/vue-resize-sensor-2.0.0.tgz",
diff --git a/PC/InterFace.Dash/package.json b/PC/InterFace.Dash/package.json
index a74c05c..7b798f1 100644
--- a/PC/InterFace.Dash/package.json
+++ b/PC/InterFace.Dash/package.json
@@ -16,6 +16,8 @@
   },
   "dependencies": {
     "af-table-column": "^1.0.3",
+    "ag-grid-community": "^30.2.1",
+    "ag-grid-vue": "^30.2.1",
     "axios": "0.18.1",
     "clipboard": "2.0.4",
     "codemirror": "5.45.0",
@@ -48,6 +50,7 @@
     "vue-grid-layout": "^2.4.0",
     "vue-i18n": "^8.28.2",
     "vue-pdf": "^4.3.0",
+    "vue-property-decorator": "^8.0.0",
     "vue-router": "3.0.2",
     "vue-splitpane": "1.0.4",
     "vuedraggable": "2.20.0",
diff --git a/PC/InterFace.Dash/src/components/AGTable/agGridBtn.vue b/PC/InterFace.Dash/src/components/AGTable/agGridBtn.vue
new file mode 100644
index 0000000..4a51a51
--- /dev/null
+++ b/PC/InterFace.Dash/src/components/AGTable/agGridBtn.vue
@@ -0,0 +1,46 @@
+<template>
+    <div>
+        <el-button 
+            v-if="!item.hide"
+            v-for="(item,index) in buttons"
+            :key="index"
+            @click="clickHandle(item)" 
+            :size="item.size" 
+            :type="item.type"
+            :style="'color:'+item.color"
+        >{{item.label}}</el-button>
+    </div>
+</template>
+<script>
+import AGTableBttons from "@/components/AGTable/btnControls.js" 
+export default {
+    data() {
+        return {
+            propsInit:null,//传参数据
+            buttons:[
+                AGTableBttons.tableEditBtn,
+                AGTableBttons.tableDeleteBtn,
+            ],
+            cellValue:null
+        };
+    },
+    mounted(){
+        this.propsInit = this.params.colDef.cellRendererParams
+        console.log(33,this.propsInit.currency)
+        this.cellValue = this.params.data;
+    },
+    methods:{
+        clickHandle(data){
+            if(data.name == 'delete'){
+                AGTableBttons.deleteHandle(()=>{
+                    console.log(33,this.cellValue)
+                })
+            }
+            // console.log(data,this.cellValue)
+        },
+        // getValueToDisplay(params) {
+        //     return this.params.api.getRowNode(params.rowIndex).data
+        // },
+    }
+}
+</script>
\ No newline at end of file
diff --git a/PC/InterFace.Dash/src/components/AGTable/btnControls.js b/PC/InterFace.Dash/src/components/AGTable/btnControls.js
new file mode 100644
index 0000000..317556e
--- /dev/null
+++ b/PC/InterFace.Dash/src/components/AGTable/btnControls.js
@@ -0,0 +1,42 @@
+// 页面基础按钮样式
+import i18n from "@/lang"
+import { MessageBox } from 'element-ui';
+
+// 编辑按钮
+const tableEditBtn= {
+    type: "text",
+    icon: "el-icon-edit",
+    label: i18n.t('btns.edit'),
+    name: "edit",
+    size: "small",
+    color: "#ff9000",
+}
+
+// 删除按钮
+const tableDeleteBtn= {
+    type: "text",
+    icon: "el-icon-delete",
+    label: i18n.t('btns.delete'),
+    name: "delete",
+    size: "small",
+    color: "red",
+}
+
+const deleteHandle = (callback) => {
+    MessageBox.confirm('您确定删除吗, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+    }).then(() => {
+        // 确定操作
+        if(callback)callback()
+    }).catch(() => {
+        //取消操作
+    });
+}
+
+export default {
+    tableEditBtn,
+    tableDeleteBtn,
+    deleteHandle
+}
\ No newline at end of file
diff --git a/PC/InterFace.Dash/src/components/AGTable/index.vue b/PC/InterFace.Dash/src/components/AGTable/index.vue
new file mode 100644
index 0000000..c8dc295
--- /dev/null
+++ b/PC/InterFace.Dash/src/components/AGTable/index.vue
@@ -0,0 +1,115 @@
+<template>
+  <div>
+      <ag-grid-vue
+          :style="'width:500px; height:'+uTableHeight + 'px'"
+          class="ag-theme-alpine"
+          :columnDefs="columnDefs"
+          :rowData="rowData"
+          :defaultColDef="defaultColDef"
+      >
+      </ag-grid-vue>
+  </div>
+</template>
+<script>
+import "ag-grid-community/styles/ag-grid.css";
+import "ag-grid-community/styles/ag-theme-alpine.css";
+import { AgGridVue } from 'ag-grid-vue';
+import agGridBtn from './agGridBtn.vue';
+export default {
+  name: "agGridDemo",
+  components: {
+    AgGridVue,
+    agGridBtn
+  },
+  props:{
+    // 操作列按钮组件名
+    agGridBtnName:{
+      type: String,
+      default:'agGridBtn'
+    },
+    // 已app-main高度为100%  需要减掉的高度
+    setUTableHeight: {
+      type: Number,
+      default: () => {
+        return 280;
+      }
+    }
+  },
+  data() {
+      return {
+          uTableHeight:null,//表格撑开高度
+          columnDefs: null,
+          rowData: null,
+          defaultColDef: {
+              // flex:1,
+              filter: true,
+              sortable: true,
+              floatingFilter: true,
+              resizable:true,
+              cellClass:"cell-wrap-text",
+              headerClass: 'ag-header-center',
+              autoHeight:true
+          },
+      };
+  },
+  watch: {
+    // 更改高度
+    setUTableHeight(n,o){
+      this.setTableHeightHandle(n)
+    }
+  },
+  mounted() {
+      this.columnDefs = [
+          {
+              field:'操作',
+              lockPosition: 'left',
+              cellRenderer: this.agGridBtnName,
+              cellRendererParams: {
+                currency: 'EUREUREUREUREUREUR'
+              },
+              cellClass: 'locked-col',
+              width: 120,
+              suppressNavigable: true,
+              pinned:'right',
+              floatingFilter:false
+          },
+          { field: "make" },
+          { field: "model" },
+          { field: "price" },
+      ];
+
+      this.rowData = [
+          { make: "Toyota", model: "Celica", price: 35000 },
+          { make: "Ford", model: "Mondeo", price: 32000 },
+          { make: "Porsche", model: "Boxster", price: 72000 },
+          { make: "Porsche", model: "Boxster", price: 72000 },
+          { make: "Porsche", model: "Boxster", price: 72000 },
+          { make: "Porsche", model: "Boxster", price: 72000 },
+          { make: "Porsche", model: "Boxster", price: 72000 },
+          { make: "Porsche", model: "Boxster", price: 72000 },
+          { make: "Porsche", model: "Boxster", price: 72000 },
+          { make: "Porsche", model: "Boxster", price: 72000 },
+          { make: "Porsche", model: "Boxster", price: 72000 },
+          { make: "Porsche", model: "Boxster", price: 72000 },
+          { make: "Porsche", model: "Boxster", price: 72000 },
+          { make: "Porsche", model: "Boxster", price: 72000 },
+      ];
+    this.setTableHeightHandle()
+  },
+  methods:{
+    // 设置表格高度
+    setTableHeightHandle(height){
+      let _height = height || this.setUTableHeight
+      let _app_height = document.getElementsByClassName('app-main')[0].clientHeight
+      this.uTableHeight = Number(_app_height) - Number(_height)
+      console.log()
+    },
+    // 获取表格高度 勿删 业务当中有用
+    getTableHeight(){
+      return this.uTableHeight
+    },
+  }
+}
+</script>
+<style lang="scss" scoped>
+</style>
\ No newline at end of file
diff --git a/PC/InterFace.Dash/src/components/tablePagination/index copy.vue b/PC/InterFace.Dash/src/components/tablePagination/index copy.vue
index c0238bc..d7f47e5 100644
--- a/PC/InterFace.Dash/src/components/tablePagination/index copy.vue	
+++ b/PC/InterFace.Dash/src/components/tablePagination/index copy.vue	
@@ -1,10 +1,12 @@
 <template>
   <div class="tablePagination">
+    <!-- 原版本 使用umytable版本 -->
     <!-- 头部按钮 -->
     <div class="table-nav">
       <curren-Button
+        v-if="headerButttondata"
         ref="tablePagination_topNav"
-        :Butttondata="currenButtonData"
+        :Butttondata="headerButttondata"
         @tableButtonClick="topbutton"
         @quicklySearchClick="quicklySearchClick"
         @quicklySearchClear="quicklySearchClear"
@@ -25,6 +27,7 @@
       :tableColumns="tableColumns"
       @overallSearchFormClick="overallSearchFormClick"
       :httpOverallSearchData="httpOverallSearchData"
+      :selectMaxHeight="selectMaxHeight"
     >
       <!-- 插槽预留 -->
       <slot name="searchPrimarySlot"></slot>
@@ -48,7 +51,7 @@
         :tableColumns="tableColumns | isTableColumns"
         :isShowIndex="isShowIndex"
         :selectionTable="tableSelection"
-        :setUTableHeight="setUTableHeight || uTableTopHeight"
+        :setUTableHeight="uTableTopHeight"
         @sortChange="sortChange"
         @handleSelectionChange="handleSelectionChange"
         @inlineDialog="inlineDialog"
@@ -91,10 +94,22 @@ export default {
     rowDrop
   },
   props: {
+    // 不使用权限的按钮
+    noUsePermissionBtn:{
+      type: Array,
+      default: () => {
+        return ['refresh','field','export','filter']//刷新，字段设置，导出，筛选
+      }
+    },
     rowMaxHeight:{
       type:String,
       default:'calc(90vh - 280px)'
     },
+    // 筛选条件最大高度
+    selectMaxHeight:{
+      type: String,
+      default: '174px'
+    },
     // 筛选高度
     searchOverallCoverHeight:{
       type: String,
@@ -222,10 +237,12 @@ export default {
   },
   data () {
     return {
+      headerButttondata:null,
       // 字段设置是否显示
       rowDropVisible: false,
       // table 重新渲染所需key
       isUpdate: false,
+      appRemoveHeight:165,
       // 除去table的高度
       uTableTopHeight:165,
       // table外部高度控制，用于点击筛选动画处理
@@ -265,8 +282,11 @@ export default {
     }
   },
   mounted(){
+    this.appRemoveHeight = this.setUTableHeight || 165
+    this.uTableTopHeight = this.appRemoveHeight
     this.uTableOuterHeight =  this.$refs.tablePaginationTableRef.getTableHeight()
     this.uTableOuterHeight_init = Number(JSON.stringify(this.uTableOuterHeight))
+    this.initButttondata()
     
     // 点击外部，字段设置弹窗隐藏
     document.addEventListener('click',(e)=>{
@@ -281,6 +301,29 @@ export default {
     })
   },
   methods: {
+    initButttondata(){
+      let _list = []
+      this.currenButtonData.forEach(item=>{
+        if(item.permission){
+          _list.push(item)
+        }else{
+          if(this.noUsePermissionBtn.indexOf(item.name) < 0){
+            let _scope = item.clientScope || localStorage.getItem('appClientScope')
+            item.permission =  [_scope + '.' +this.$route.name+'.'+(item.permissionName || item.name)]
+          }else{
+            item.permission = []
+          }
+          _list.push(item)
+        }
+      })
+      this.headerButttondata = _list
+    },
+    // 重新渲染表格
+    doFreshTableLayout(){
+      if(this.$refs.tablePaginationTableRef && this.$refs.tablePaginationTableRef.doFreshLayout){
+        this.$refs.tablePaginationTableRef.doFreshLayout()
+      }
+    },
     rowDrop(data,type) {
       this.$emit('rowDrop',data,type)
       this.$nextTick(()=>{
@@ -296,27 +339,47 @@ export default {
         if(this.primarySearchOption && this.primarySearchOption.length > 0){
           this.$nextTick(()=>{
             let _search_height = this.$refs.searchOverallRef.getSearchPrimaryHeight()
-            if(this.showSearchOverall){
-              let _margin = 20
-              this.uTableOuterHeight = this.uTableOuterHeight_init - _search_height - _margin
-              setTimeout(()=>{
-                this.uTableTopHeight +=  _search_height + _margin
-              },0)
-            }else{
-              this.uTableOuterHeight = this.uTableOuterHeight_init
-              setTimeout(()=>{
-                this.uTableTopHeight = 165
-              },0)
-            }
+            this.changeTableHeight(_search_height)
+            // if(this.showSearchOverall){
+            //   let _margin = 20
+            //   this.uTableOuterHeight = this.uTableOuterHeight_init - _search_height - _margin
+            //   setTimeout(()=>{
+            //     this.uTableTopHeight +=  _search_height + _margin
+            //   },0)
+            // }else{
+            //   this.uTableOuterHeight = this.uTableOuterHeight_init
+            //   setTimeout(()=>{
+            //     this.uTableTopHeight = 165
+            //   },0)
+            // }
           })
         }
-      } 
+        this.$nextTick(()=>{
+          let _search_height = this.$refs.searchOverallRef.getAllSearchInnerHeight()
+          this.changeTableHeight(_search_height)
+        })
+      }
       // 字段设置
       else if (val == 'field') {
         this.rowDropVisible = !this.rowDropVisible
       }
       this.$emit("topbutton", val,item)
     },
+    // 更改筛选时候的table高度问题
+    changeTableHeight(minusHeight=0){
+      if(this.showSearchOverall){
+        let _margin = 20
+        this.uTableOuterHeight = this.uTableOuterHeight_init - minusHeight - _margin
+        setTimeout(()=>{
+          this.uTableTopHeight =  minusHeight + this.appRemoveHeight + _margin
+        },0)
+      }else{
+        this.uTableOuterHeight = this.uTableOuterHeight_init
+        setTimeout(()=>{
+          this.uTableTopHeight = this.appRemoveHeight
+        },0)
+      }
+    }, 
     // 快速搜索 - 搜索按钮
     quicklySearchClick (val,option) {
       this.$emit("quicklySearchClick", val,option,this.$refs.searchOverallRef)
@@ -369,7 +432,7 @@ export default {
     // 全面筛选组件所有按钮事件
     overallSearchFormClick(options){
       //增加快速搜索实体
-      options.vm_quickly = this.$refs.tablePagination_topNav.getQuicklySearchDom()
+      if(this.$refs.tablePagination_topNav)options.vm_quickly = this.$refs.tablePagination_topNav.getQuicklySearchDom()
       this.$emit("overallSearchFormClick", options)
     },
     // 关闭字段设置
diff --git a/PC/InterFace.Dash/src/components/tablePagination/index.vue b/PC/InterFace.Dash/src/components/tablePagination/index.vue
index 455d233..e4a91f9 100644
--- a/PC/InterFace.Dash/src/components/tablePagination/index.vue
+++ b/PC/InterFace.Dash/src/components/tablePagination/index.vue
@@ -42,6 +42,11 @@
     ></rowDrop>
     <!-- 列表 -->
     <div class="uTableOuter" ref="uTableOuterRef" :style="{height:uTableOuterHeight + 'px',overflow:'hidden'}">
+      <!-- <AGTable
+        ref="tablePaginationTableRef"
+        :setUTableHeight="uTableTopHeight"
+        :agGridBtnName="'agGridBtn'"
+      ></AGTable> -->
       <umyTable
         ref="tablePaginationTableRef"
         :isUpdate="isUpdate"
@@ -97,7 +102,7 @@ export default {
     noUsePermissionBtn:{
       type: Array,
       default: () => {
-        return ['refresh','field','export','filter']//刷新，字段设置，导出，筛选
+        return ['refresh','field','filterForDetail','export','filter']//刷新，字段设置，明细查询，导出，筛选
       }
     },
     rowMaxHeight:{
diff --git a/PC/InterFace.Dash/src/components/umyTable/index.vue b/PC/InterFace.Dash/src/components/umyTable/index.vue
index 397654c..1129dc6 100644
--- a/PC/InterFace.Dash/src/components/umyTable/index.vue
+++ b/PC/InterFace.Dash/src/components/umyTable/index.vue
@@ -414,7 +414,7 @@ export default {
         this.$refs.multipleTable.$forceUpdate()
       });
     },
-    // 获取表格高度 误删 业务当中有用
+    // 获取表格高度 勿删 业务当中有用
     getTableHeight(){
       return this.uTableHeight
     },
diff --git a/PC/InterFace.Dash/src/lang/en.js b/PC/InterFace.Dash/src/lang/en.js
index 8e09e2f..482170a 100644
--- a/PC/InterFace.Dash/src/lang/en.js
+++ b/PC/InterFace.Dash/src/lang/en.js
@@ -28,7 +28,7 @@ export default {
         import:'导入',
         edit:'编辑',
         delete:'删除',
-        DetailedQuery:'明细查询'
+        DetailedQuery:'所有明细查询'
     },
     columNames:{
         CreationTime:'CreationTime',
diff --git a/PC/InterFace.Dash/src/lang/zh.js b/PC/InterFace.Dash/src/lang/zh.js
index 687fe2e..1565b72 100644
--- a/PC/InterFace.Dash/src/lang/zh.js
+++ b/PC/InterFace.Dash/src/lang/zh.js
@@ -12,7 +12,7 @@ export default {
         import:'导入',
         edit:'编辑',
         delete:'删除',
-        DetailedQuery:'明细查询'
+        DetailedQuery:'所有明细查询'
     },
     columNames:{
         CreationTime:'创建时间',
diff --git a/PC/InterFace.Dash/src/router/index.js b/PC/InterFace.Dash/src/router/index.js
index a1459f1..bf50735 100644
--- a/PC/InterFace.Dash/src/router/index.js
+++ b/PC/InterFace.Dash/src/router/index.js
@@ -117,24 +117,24 @@ export let constantRoutes = [
       }
     }]
   },
-  // {
-  //   path: '/',
-  //   component: Layout,
-  //   redirect: '/RoleManage',
-  //   hidden: true,
-  //   children: [{
-  //     path: 'RoleManage',
-  //     component: () => import('@/views/systemManage/RoleManage'),
-  //     name: 'RoleManage',
-  //     meta: {
-  //       keepAlive : true, 
-  //       title: 'RoleManage',
-  //       icon: 'svg_dashboard',
-  //       outerFirst:true
-  //       // affix: true
-  //     }
-  //   }]
-  // }, 
+  {
+    path: '/',
+    component: Layout,
+    redirect: '/agGridDemo',
+    hidden: true,
+    children: [{
+      path: 'agGridDemo',
+      component: () => import('@/views/demo/agGridDemo'),
+      name: 'agGridDemo',
+      meta: {
+        keepAlive : true, 
+        title: 'agGridDemo',
+        icon: 'svg_dashboard',
+        outerFirst:true
+        // affix: true
+      }
+    }]
+  }, 
 ]
 
 /**
diff --git a/PC/InterFace.Dash/src/utils/utils.js b/PC/InterFace.Dash/src/utils/utils.js
index 6e3cf6c..fde7266 100644
--- a/PC/InterFace.Dash/src/utils/utils.js
+++ b/PC/InterFace.Dash/src/utils/utils.js
@@ -61,6 +61,7 @@ import conditionFilters from "@/components/conditionFilters" //高级筛选
 import searchPage from '@/components/searchPage' //autocomplete拉取数据探弹窗
 import newAndEdiDialog from '@/components/newAndEdiDialog' //普通新增与编辑
 import umyTable from '@/components/umyTable' // 用于数据量过大table
+import AGTable from '@/components/AGTable' // 用于数据量过大table
 import filterForDetailPage from '@/components/filterForDetailPage' //明细查询
 import addEditFromApiPop from '@/components/addEditFromApiPop' //新增与编辑(只有主表)，参数配置从api获取
 
@@ -113,6 +114,7 @@ Vue.component('conditionFilters', conditionFilters)
 Vue.component('searchPage', searchPage)
 Vue.component('newAndEdiDialog', newAndEdiDialog)
 Vue.component('umyTable', umyTable)
+Vue.component('AGTable', AGTable)
 Vue.component('filterForDetailPage', filterForDetailPage)
 Vue.component('addEditFromApiPop', addEditFromApiPop)
 Vue.prototype.$echarts = eCharts
diff --git a/PC/InterFace.Dash/src/views/demo/agGridBtn.vue b/PC/InterFace.Dash/src/views/demo/agGridBtn.vue
new file mode 100644
index 0000000..fd47f69
--- /dev/null
+++ b/PC/InterFace.Dash/src/views/demo/agGridBtn.vue
@@ -0,0 +1,27 @@
+<template>
+    <div>
+        <el-button @click="clickHandle('edit')" size="small" type="text">编辑</el-button>
+        <el-button @click="clickHandle('delete')" size="small" type="text">删除</el-button>
+    </div>
+</template>
+<script>
+export default {
+    data() {
+        return {
+            cellValue:null
+        };
+    },
+    mounted(){
+        console.log(16,this.params.api.getRowNode(2))
+        this.cellValue = this.params.data;
+    },
+    methods:{
+        clickHandle(data){
+            console.log(data,this.cellValue)
+        },
+        // getValueToDisplay(params) {
+        //     return this.params.api.getRowNode(params.rowIndex).data
+        // },
+    }
+}
+</script>
\ No newline at end of file
diff --git a/PC/InterFace.Dash/src/views/demo/agGridDemo.vue b/PC/InterFace.Dash/src/views/demo/agGridDemo.vue
new file mode 100644
index 0000000..a8ffeaf
--- /dev/null
+++ b/PC/InterFace.Dash/src/views/demo/agGridDemo.vue
@@ -0,0 +1,66 @@
+<template>
+    <div>
+        <ag-grid-vue
+            style="width:500px; height: 500px"
+            class="ag-theme-alpine"
+            :columnDefs="columnDefs"
+            :rowData="rowData"
+            :defaultColDef="defaultColDef"
+        >
+        </ag-grid-vue>
+    </div>
+</template>
+<script>
+import "ag-grid-community/styles/ag-grid.css";
+import "ag-grid-community/styles/ag-theme-alpine.css";
+import { AgGridVue } from 'ag-grid-vue';
+import agGridBtn from './agGridBtn.vue';
+export default {
+    name: "agGridDemo",
+    components: {
+      AgGridVue,
+      agGridBtn
+    },
+    data() {
+        return {
+            columnDefs: null,
+            rowData: null,
+            defaultColDef: {
+                // flex:1,
+                filter: true,
+                sortable: true,
+                floatingFilter: true,
+                resizable:true,
+                cellClass:"cell-wrap-text",
+                headerClass: 'ag-header-center',
+                autoHeight:true
+            },
+        };
+    },
+    mounted() {
+        this.columnDefs = [
+            {
+                field:'操作',
+                lockPosition: 'left',
+                cellRenderer: 'agGridBtn',
+                cellClass: 'locked-col',
+                width: 120,
+                suppressNavigable: true,
+                pinned:'right',
+                floatingFilter:false
+            },
+            { field: "make" },
+            { field: "model" },
+            { field: "price" },
+        ];
+
+        this.rowData = [
+            { make: "Toyota", model: "Celica", price: 35000 },
+            { make: "Ford", model: "Mondeo", price: 32000 },
+            { make: "Porsche", model: "Boxster", price: 72000 },
+        ];
+    },
+}
+</script>
+<style lang="scss" scoped>
+</style>
\ No newline at end of file
diff --git a/PC/InterFace.Dash/src/views/menuList/OutgoingData.vue b/PC/InterFace.Dash/src/views/menuList/OutgoingData.vue
index 4918eae..7267b11 100644
--- a/PC/InterFace.Dash/src/views/menuList/OutgoingData.vue
+++ b/PC/InterFace.Dash/src/views/menuList/OutgoingData.vue
@@ -80,7 +80,7 @@ export default {
         name:'isRepush',
         hide:true
       }]
-      if(data.status == '-1' || data.status == '-2'){
+      if(data.status == '-1' || data.status == '-2' || data.status == '-3' || data.status == '-4'){
         _btn[0].hide = false
       }
       return _btn
diff --git a/PC/UI.WinIn.FasterZ.AgGridReport/src/utils/util.js b/PC/UI.WinIn.FasterZ.AgGridReport/src/utils/util.js
index 0b32721..f71584f 100644
--- a/PC/UI.WinIn.FasterZ.AgGridReport/src/utils/util.js
+++ b/PC/UI.WinIn.FasterZ.AgGridReport/src/utils/util.js
@@ -29,6 +29,17 @@ var dateFilterParams = {
     }
 }
 
+// 2022-08-31T09:45:51.9340433  转 2022-08-31 09:45:51
+var formatTimeStrToStr = function(timeStr) {
+  if (!timeStr || !new Date(timeStr)) {
+    return ''
+  }
+  if (timeStr.lastIndexOf('.') == -1) {
+      return timeStr.replace('T',' ').substring(0,timeStr.length)
+  }
+  return timeStr.replace('T',' ').substring(0,timeStr.lastIndexOf('.'))
+}
+
 // 转换数字小数点保留+千位符
 /**
  * @param {*} number 数值
@@ -66,5 +77,6 @@ export default {
     addEventResizeFlesh:addEventResizeFlesh,
     dateFilterParams:dateFilterParams,
     numberFixedFormatter,
-    numberPercentFormatter
+    numberPercentFormatter,
+    formatTimeStrToStr
 }
\ No newline at end of file
diff --git a/PC/UI.WinIn.FasterZ.AgGridReport/src/views/report/EQLevelReport.vue b/PC/UI.WinIn.FasterZ.AgGridReport/src/views/report/EQLevelReport.vue
index 8f69120..0be0a14 100644
--- a/PC/UI.WinIn.FasterZ.AgGridReport/src/views/report/EQLevelReport.vue
+++ b/PC/UI.WinIn.FasterZ.AgGridReport/src/views/report/EQLevelReport.vue
@@ -31,6 +31,7 @@ export default {
         { field: '库位代码', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
         { field: '物品质量信息',  cellClass:"centerAlign", filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
         { field: '标签质量信息',  cellClass:"centerAlign", filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '收货时间',  cellClass:"centerAlign", valueFormatter: ((data)=>{return util.formatTimeStrToStr(data.value)}), filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
       ],
       searchConfig:[
         {type:'select',prop:'ItemCode',label:'物料',optionsProc:'itemCode',options:[]},
diff --git a/PC/UI.WinIn.FasterZ.Job/src/components/tablePagination/index.vue b/PC/UI.WinIn.FasterZ.Job/src/components/tablePagination/index.vue
index 455d233..fafa8dc 100644
--- a/PC/UI.WinIn.FasterZ.Job/src/components/tablePagination/index.vue
+++ b/PC/UI.WinIn.FasterZ.Job/src/components/tablePagination/index.vue
@@ -97,7 +97,7 @@ export default {
     noUsePermissionBtn:{
       type: Array,
       default: () => {
-        return ['refresh','field','export','filter']//刷新，字段设置，导出，筛选
+        return ['refresh','field','filterForDetail','export','filter']//刷新，字段设置，明细查询，导出，筛选
       }
     },
     rowMaxHeight:{
diff --git a/PC/UI.WinIn.FasterZ.Job/src/lang/en.js b/PC/UI.WinIn.FasterZ.Job/src/lang/en.js
index 8e09e2f..482170a 100644
--- a/PC/UI.WinIn.FasterZ.Job/src/lang/en.js
+++ b/PC/UI.WinIn.FasterZ.Job/src/lang/en.js
@@ -28,7 +28,7 @@ export default {
         import:'导入',
         edit:'编辑',
         delete:'删除',
-        DetailedQuery:'明细查询'
+        DetailedQuery:'所有明细查询'
     },
     columNames:{
         CreationTime:'CreationTime',
diff --git a/PC/UI.WinIn.FasterZ.Job/src/lang/zh.js b/PC/UI.WinIn.FasterZ.Job/src/lang/zh.js
index 687fe2e..1565b72 100644
--- a/PC/UI.WinIn.FasterZ.Job/src/lang/zh.js
+++ b/PC/UI.WinIn.FasterZ.Job/src/lang/zh.js
@@ -12,7 +12,7 @@ export default {
         import:'导入',
         edit:'编辑',
         delete:'删除',
-        DetailedQuery:'明细查询'
+        DetailedQuery:'所有明细查询'
     },
     columNames:{
         CreationTime:'创建时间',
diff --git a/PC/UI.WinIn.FasterZ.Store/src/components/tablePagination/index.vue b/PC/UI.WinIn.FasterZ.Store/src/components/tablePagination/index.vue
index 455d233..fafa8dc 100644
--- a/PC/UI.WinIn.FasterZ.Store/src/components/tablePagination/index.vue
+++ b/PC/UI.WinIn.FasterZ.Store/src/components/tablePagination/index.vue
@@ -97,7 +97,7 @@ export default {
     noUsePermissionBtn:{
       type: Array,
       default: () => {
-        return ['refresh','field','export','filter']//刷新，字段设置，导出，筛选
+        return ['refresh','field','filterForDetail','export','filter']//刷新，字段设置，明细查询，导出，筛选
       }
     },
     rowMaxHeight:{
diff --git a/PC/UI.WinIn.FasterZ.Store/src/lang/en.js b/PC/UI.WinIn.FasterZ.Store/src/lang/en.js
index 8e09e2f..482170a 100644
--- a/PC/UI.WinIn.FasterZ.Store/src/lang/en.js
+++ b/PC/UI.WinIn.FasterZ.Store/src/lang/en.js
@@ -28,7 +28,7 @@ export default {
         import:'导入',
         edit:'编辑',
         delete:'删除',
-        DetailedQuery:'明细查询'
+        DetailedQuery:'所有明细查询'
     },
     columNames:{
         CreationTime:'CreationTime',
diff --git a/PC/UI.WinIn.FasterZ.Store/src/lang/zh.js b/PC/UI.WinIn.FasterZ.Store/src/lang/zh.js
index 687fe2e..1565b72 100644
--- a/PC/UI.WinIn.FasterZ.Store/src/lang/zh.js
+++ b/PC/UI.WinIn.FasterZ.Store/src/lang/zh.js
@@ -12,7 +12,7 @@ export default {
         import:'导入',
         edit:'编辑',
         delete:'删除',
-        DetailedQuery:'明细查询'
+        DetailedQuery:'所有明细查询'
     },
     columNames:{
         CreationTime:'创建时间',
diff --git a/PC/UI.WinIn.FasterZ.Store/src/utils/baseData/urlOption.js b/PC/UI.WinIn.FasterZ.Store/src/utils/baseData/urlOption.js
index b8245ca..5db18d8 100644
--- a/PC/UI.WinIn.FasterZ.Store/src/utils/baseData/urlOption.js
+++ b/PC/UI.WinIn.FasterZ.Store/src/utils/baseData/urlOption.js
@@ -269,6 +269,18 @@ export const JisDeliverNoteDetail = {
     detailURL:'app/jis-deliver-note-detail',//主表-明细 + 明细-查看主表
 }
 
+export const OuterJisL7DeliverNote = {
+    baseURL:'OuterJisL7DeliverNote/base',//主表-列表
+    detailURL:'app/outer-jis-l7Deliver-note',//主表-明细 + 明细-查看主表
+    detailListURL:'OuterJisL7DeliverNoteDetail/base',//明细-列表,
+    masterId:'masterID',//明细获取主表信息的masterId
+}
+
+export const OuterJisL7DeliverNoteDetail = {
+    baseURL:'OuterJisL7DeliverNoteDetail/base',//主表-列表
+    detailURL:'app/outer-jis-l7Deliver-note-detail',//主表-明细 + 明细-查看主表
+}
+
 export const JisProduct = {
     baseURL:'JisProduct/base',//主表-列表
     detailURL:'app/jis-product',//主表-明细 + 明细-查看主表
diff --git a/PC/UI.WinIn.FasterZ.Store/src/views/menuList/OuterJisL7DeliverNote.vue b/PC/UI.WinIn.FasterZ.Store/src/views/menuList/OuterJisL7DeliverNote.vue
new file mode 100644
index 0000000..f01d52b
--- /dev/null
+++ b/PC/UI.WinIn.FasterZ.Store/src/views/menuList/OuterJisL7DeliverNote.vue
@@ -0,0 +1,104 @@
+<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_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"
+      :propsData="propsData"
+      :Butttondata="[]"
+      @drawerShut="(val) => (displayDialog.detailsDialog = val)"
+      @drawerbutton="drawerbutton"
+      @handleCommand="drawerHandle"
+      @close-value="closeValue"
+      :totalCount="totalCountDetails"
+      :currentPage="oldSkipCountDetails"
+      :MaxResultCount="MaxResultCountDetails"
+      @alterResultCountDetails="alterResultCountDetails"
+      @alertoldSkipCountDetails="alertoldSkipCountDetails"
+      :buttonOperationList_left="operationButtonsDetail"
+    ></curren-Drawer>
+    <!-- 明细查询页面 -->
+    <filterForDetailPage
+      v-if="filterForDetailShow"
+      :parentColumns="apiColumns_Table"
+      @closeDialog="changeFilterForDetailShow"
+    ></filterForDetailPage>
+    <!-- 导出弹窗 -->
+    <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 { mixins } from "@/mixins/mixins";
+import { filterSelectMixins } from '@/mixins/filter-Select'
+
+export default {
+  name: "OuterJisL7DeliverNote",
+  mixins: [
+    tableMixins,
+    LoadingMixins,
+    drawerMixins,
+    TableHeaderMixins,
+    mixins,
+    filterSelectMixins,
+  ],
+  data() {
+    return {
+      //常用按钮数据
+      currenButtonData: [
+        this.defaultExportBtn({
+          isRedundance:true,
+          isDetailExport:true
+        }),//导出
+        this.defaultFieldSettingBtn(),//字段设置
+        this.defaultFreshBtn(),//刷新
+        this.defaultFilterBtn(),//筛选
+        this.defaultFilterForDetailBtn()//明细查询按钮
+      ],
+    };
+  },
+  mounted() {
+    this.paging();
+  },
+}
+</script>
+<style lang="scss" scoped>
+@import "@/styles/basicData.scss";
+</style>
\ No newline at end of file
diff --git a/PC/UI.WinIn.FasterZ.Store/src/views/menuList/OuterJisL7DeliverNoteDetail.vue b/PC/UI.WinIn.FasterZ.Store/src/views/menuList/OuterJisL7DeliverNoteDetail.vue
new file mode 100644
index 0000000..a1100f2
--- /dev/null
+++ b/PC/UI.WinIn.FasterZ.Store/src/views/menuList/OuterJisL7DeliverNoteDetail.vue
@@ -0,0 +1,100 @@
+<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"
+    ></tablePagination>
+    <!-- :buttonOperationList_left="buttonOperationClick_leftBase"
+      @buttonOperationClick_left="buttonOperationClick_left" -->
+    <!-- <curren-Drawer
+      ref="currenDrawer_Ref"
+      :title="apiColumns_DesTions"
+      @rowDrop="rowDrop"
+      :tableColumns="apiColumns_DetailsTable"
+      :tabsDesTions="apiColumns_DesTions"
+      :DrawerLoading="Loading.DrawerLoading"
+      :drawer="displayDialog.detailsDialog"
+      :propsData="propsData"
+      :Butttondata="[]"
+      @drawerShut="(val) => (displayDialog.detailsDialog = val)"
+      @drawerbutton="drawerbutton"
+      @handleCommand="drawerHandle"
+      @close-value="closeValue"
+      :totalCount="totalCountDetails"
+      :currentPage="oldSkipCountDetails"
+      :MaxResultCount="MaxResultCountDetails"
+      @alterResultCountDetails="alterResultCountDetails"
+      @alertoldSkipCountDetails="alertoldSkipCountDetails"
+      :buttonOperationList_left="operationButtonsDetail"
+    ></curren-Drawer> -->
+    <!-- 导出弹窗 -->
+    <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'
+
+
+export default {
+  name: "OuterJisL7DeliverNoteDetail",
+  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