From 9437243186a2e0c796f009979db8eaa14e6cabab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com>
Date: Wed, 8 Nov 2023 15:18:01 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=8E=A5=E5=8F=A3=E7=9C=8B=E6=9D=BF+j?=
 =?UTF-8?q?ob+store=E3=80=91=E6=8C=89=E9=92=AE=E6=9D=83=E9=99=90=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/tablePagination/index.vue  |   2 +-
 PC/InterFace.Dash/src/utils/defaultButtons.js |   4 +-
 .../views/menuList/AsnMstr_child_add_demo.vue | 113 ++++++++++++++++++
 .../src/components/tablePagination/index.vue  |   2 +-
 .../src/utils/defaultButtons.js               |   4 +-
 .../src/components/tablePagination/index.vue  |   2 +-
 .../src/utils/defaultButtons.js               |   4 +-
 7 files changed, 125 insertions(+), 6 deletions(-)
 create mode 100644 PC/InterFace.Dash/src/views/menuList/AsnMstr_child_add_demo.vue

diff --git a/PC/InterFace.Dash/src/components/tablePagination/index.vue b/PC/InterFace.Dash/src/components/tablePagination/index.vue
index a081346..455d233 100644
--- a/PC/InterFace.Dash/src/components/tablePagination/index.vue
+++ b/PC/InterFace.Dash/src/components/tablePagination/index.vue
@@ -308,7 +308,7 @@ export default {
         }else{
           if(this.noUsePermissionBtn.indexOf(item.name) < 0){
             let _scope = item.clientScope || localStorage.getItem('appClientScope')
-            item.permission =  [_scope + '.' +this.$route.name+'.'+item.name]
+            item.permission =  [_scope + '.' +this.$route.name+'.'+(item.permissionName || item.name)]
           }else{
             item.permission = []
           }
diff --git a/PC/InterFace.Dash/src/utils/defaultButtons.js b/PC/InterFace.Dash/src/utils/defaultButtons.js
index 8dcf1c8..85e47d7 100644
--- a/PC/InterFace.Dash/src/utils/defaultButtons.js
+++ b/PC/InterFace.Dash/src/utils/defaultButtons.js
@@ -15,7 +15,8 @@ export function defaultAddBtn(option) {
         label: i18n.t('btns.add'),
         name: "Create",
         size: "mini",
-        background:"#31bb99"
+        background:"#31bb99",
+        permissionName:"Create",
     })
 }
 
@@ -124,5 +125,6 @@ function __defaultBtnOption(option,specific){
         isRedundance:option && option.isRedundance ? option.isRedundance : false,
         permission:option && option.permission ? option.permission : null,
         clientScope:option && option.clientScope ? option.clientScope : null,
+        permissionName:option && option.permissionName ? option.permissionName : specific.permissionName,
     }
 }
\ No newline at end of file
diff --git a/PC/InterFace.Dash/src/views/menuList/AsnMstr_child_add_demo.vue b/PC/InterFace.Dash/src/views/menuList/AsnMstr_child_add_demo.vue
new file mode 100644
index 0000000..1032eae
--- /dev/null
+++ b/PC/InterFace.Dash/src/views/menuList/AsnMstr_child_add_demo.vue
@@ -0,0 +1,113 @@
+<template>
+  <div class="page-box" v-loading="Loading.tableLoading">
+    <!-- DEMO: API新增编辑删除 根据details判断是否有子表编辑-->
+    <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"
+      :buttonOperationList_right="(data)=>{return buttonOperationList_rightApi(data,'edit|delete')}"
+      @buttonOperationClick_right="buttonOperationClick_right"
+    ></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>
+    <!-- 导出弹窗 -->
+    <exportDrop 
+      v-if="displayDialog.exportDialog"
+      @closeDialog="closeExportDrop"
+      @exportDropSubmit="exportDropSubmit"
+    ></exportDrop>
+    <!-- Api新增 -->
+    <addEditFromApiPop
+      v-if="displayDialog.addEditApiDialog"
+      :handleType="addEditApiType"
+      :editRowData="editFromApiRowData"
+      @closePop="closeAddEditApiPop"
+      @exitAfterHandle="paging"
+    ></addEditFromApiPop>
+  </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'
+import { getToken } from '@/utils/auth'
+
+
+export default {
+  name: "AsnMstr",
+  mixins: [
+    tableMixins,
+    LoadingMixins,
+    drawerMixins,
+    TableHeaderMixins,
+    mixins,
+    filterSelectMixins,
+  ],
+  data() {
+    return {
+      //常用按钮数据
+      currenButtonData: [
+        this.defaultAddBtn({
+          name:'addFromApi'
+        }),//新增
+        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/PC/UI.WinIn.FasterZ.Job/src/components/tablePagination/index.vue b/PC/UI.WinIn.FasterZ.Job/src/components/tablePagination/index.vue
index a081346..455d233 100644
--- a/PC/UI.WinIn.FasterZ.Job/src/components/tablePagination/index.vue
+++ b/PC/UI.WinIn.FasterZ.Job/src/components/tablePagination/index.vue
@@ -308,7 +308,7 @@ export default {
         }else{
           if(this.noUsePermissionBtn.indexOf(item.name) < 0){
             let _scope = item.clientScope || localStorage.getItem('appClientScope')
-            item.permission =  [_scope + '.' +this.$route.name+'.'+item.name]
+            item.permission =  [_scope + '.' +this.$route.name+'.'+(item.permissionName || item.name)]
           }else{
             item.permission = []
           }
diff --git a/PC/UI.WinIn.FasterZ.Job/src/utils/defaultButtons.js b/PC/UI.WinIn.FasterZ.Job/src/utils/defaultButtons.js
index 8dcf1c8..85e47d7 100644
--- a/PC/UI.WinIn.FasterZ.Job/src/utils/defaultButtons.js
+++ b/PC/UI.WinIn.FasterZ.Job/src/utils/defaultButtons.js
@@ -15,7 +15,8 @@ export function defaultAddBtn(option) {
         label: i18n.t('btns.add'),
         name: "Create",
         size: "mini",
-        background:"#31bb99"
+        background:"#31bb99",
+        permissionName:"Create",
     })
 }
 
@@ -124,5 +125,6 @@ function __defaultBtnOption(option,specific){
         isRedundance:option && option.isRedundance ? option.isRedundance : false,
         permission:option && option.permission ? option.permission : null,
         clientScope:option && option.clientScope ? option.clientScope : null,
+        permissionName:option && option.permissionName ? option.permissionName : specific.permissionName,
     }
 }
\ No newline at end of file
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 a081346..455d233 100644
--- a/PC/UI.WinIn.FasterZ.Store/src/components/tablePagination/index.vue
+++ b/PC/UI.WinIn.FasterZ.Store/src/components/tablePagination/index.vue
@@ -308,7 +308,7 @@ export default {
         }else{
           if(this.noUsePermissionBtn.indexOf(item.name) < 0){
             let _scope = item.clientScope || localStorage.getItem('appClientScope')
-            item.permission =  [_scope + '.' +this.$route.name+'.'+item.name]
+            item.permission =  [_scope + '.' +this.$route.name+'.'+(item.permissionName || item.name)]
           }else{
             item.permission = []
           }
diff --git a/PC/UI.WinIn.FasterZ.Store/src/utils/defaultButtons.js b/PC/UI.WinIn.FasterZ.Store/src/utils/defaultButtons.js
index 8dcf1c8..85e47d7 100644
--- a/PC/UI.WinIn.FasterZ.Store/src/utils/defaultButtons.js
+++ b/PC/UI.WinIn.FasterZ.Store/src/utils/defaultButtons.js
@@ -15,7 +15,8 @@ export function defaultAddBtn(option) {
         label: i18n.t('btns.add'),
         name: "Create",
         size: "mini",
-        background:"#31bb99"
+        background:"#31bb99",
+        permissionName:"Create",
     })
 }
 
@@ -124,5 +125,6 @@ function __defaultBtnOption(option,specific){
         isRedundance:option && option.isRedundance ? option.isRedundance : false,
         permission:option && option.permission ? option.permission : null,
         clientScope:option && option.clientScope ? option.clientScope : null,
+        permissionName:option && option.permissionName ? option.permissionName : specific.permissionName,
     }
 }
\ No newline at end of file