From 67b8ee7026873afceea8db7eacd6e1e548ca1b3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com>
Date: Tue, 14 Nov 2023 17:29:47 +0800
Subject: [PATCH] =?UTF-8?q?l7=E4=B8=BB=E5=AD=90=E8=A1=A8=E6=9A=82=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/utils/baseData/urlOption.js           | 14 ++++++-------
 ...iverNote.vue => OuterJisL7DeliverNote.vue} |  2 +-
 ...il.vue => OuterJisL7DeliverNoteDetail.vue} | 20 ++++++++-----------
 3 files changed, 16 insertions(+), 20 deletions(-)
 rename PC/UI.WinIn.FasterZ.Store/src/views/menuList/{JisL7DeliverNote.vue => OuterJisL7DeliverNote.vue} (98%)
 rename PC/UI.WinIn.FasterZ.Store/src/views/menuList/{JisL7DeliverNoteDetail.vue => OuterJisL7DeliverNoteDetail.vue} (86%)

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 2359a08..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,16 +269,16 @@ export const JisDeliverNoteDetail = {
     detailURL:'app/jis-deliver-note-detail',//主表-明细 + 明细-查看主表
 }
 
-export const JisL7DeliverNote = {
-    baseURL:'JisL7DeliverNote/base',//主表-列表
-    detailURL:'app/jis-l7-deliver-note',//主表-明细 + 明细-查看主表
-    detailListURL:'JisL7DeliverNoteDetail/base',//明细-列表,
+export const OuterJisL7DeliverNote = {
+    baseURL:'OuterJisL7DeliverNote/base',//主表-列表
+    detailURL:'app/outer-jis-l7Deliver-note',//主表-明细 + 明细-查看主表
+    detailListURL:'OuterJisL7DeliverNoteDetail/base',//明细-列表,
     masterId:'masterID',//明细获取主表信息的masterId
 }
 
-export const JisL7DeliverNoteDetail = {
-    baseURL:'JisL7DeliverNoteDetail/base',//主表-列表
-    detailURL:'app/jis-l7-deliver-note-detail',//主表-明细 + 明细-查看主表
+export const OuterJisL7DeliverNoteDetail = {
+    baseURL:'OuterJisL7DeliverNoteDetail/base',//主表-列表
+    detailURL:'app/outer-jis-l7Deliver-note-detail',//主表-明细 + 明细-查看主表
 }
 
 export const JisProduct = {
diff --git a/PC/UI.WinIn.FasterZ.Store/src/views/menuList/JisL7DeliverNote.vue b/PC/UI.WinIn.FasterZ.Store/src/views/menuList/OuterJisL7DeliverNote.vue
similarity index 98%
rename from PC/UI.WinIn.FasterZ.Store/src/views/menuList/JisL7DeliverNote.vue
rename to PC/UI.WinIn.FasterZ.Store/src/views/menuList/OuterJisL7DeliverNote.vue
index c8ab5e2..f01d52b 100644
--- a/PC/UI.WinIn.FasterZ.Store/src/views/menuList/JisL7DeliverNote.vue
+++ b/PC/UI.WinIn.FasterZ.Store/src/views/menuList/OuterJisL7DeliverNote.vue
@@ -70,7 +70,7 @@ import { mixins } from "@/mixins/mixins";
 import { filterSelectMixins } from '@/mixins/filter-Select'
 
 export default {
-  name: "JisL7DeliverNote",
+  name: "OuterJisL7DeliverNote",
   mixins: [
     tableMixins,
     LoadingMixins,
diff --git a/PC/UI.WinIn.FasterZ.Store/src/views/menuList/JisL7DeliverNoteDetail.vue b/PC/UI.WinIn.FasterZ.Store/src/views/menuList/OuterJisL7DeliverNoteDetail.vue
similarity index 86%
rename from PC/UI.WinIn.FasterZ.Store/src/views/menuList/JisL7DeliverNoteDetail.vue
rename to PC/UI.WinIn.FasterZ.Store/src/views/menuList/OuterJisL7DeliverNoteDetail.vue
index 89575c9..a1100f2 100644
--- a/PC/UI.WinIn.FasterZ.Store/src/views/menuList/JisL7DeliverNoteDetail.vue
+++ b/PC/UI.WinIn.FasterZ.Store/src/views/menuList/OuterJisL7DeliverNoteDetail.vue
@@ -23,10 +23,10 @@
       :primarySearchOption="primarySearchOption"
       @overallSearchFormClick="overallSearchFormClick"
       :httpOverallSearchData="httpOverallSearchData"
-      :buttonOperationList_left="buttonOperationClick_leftBase"
-      @buttonOperationClick_left="buttonOperationClick_left"
     ></tablePagination>
-    <curren-Drawer
+    <!-- :buttonOperationList_left="buttonOperationClick_leftBase"
+      @buttonOperationClick_left="buttonOperationClick_left" -->
+    <!-- <curren-Drawer
       ref="currenDrawer_Ref"
       :title="apiColumns_DesTions"
       @rowDrop="rowDrop"
@@ -46,13 +46,7 @@
       @alterResultCountDetails="alterResultCountDetails"
       @alertoldSkipCountDetails="alertoldSkipCountDetails"
       :buttonOperationList_left="operationButtonsDetail"
-    ></curren-Drawer>
-    <!-- 明细查询页面 -->
-    <filterForDetailPage
-      v-if="filterForDetailShow"
-      :parentColumns="apiColumns_Table"
-      @closeDialog="changeFilterForDetailShow"
-    ></filterForDetailPage>
+    ></curren-Drawer> -->
     <!-- 导出弹窗 -->
     <exportDrop 
       v-if="displayDialog.exportDialog"
@@ -66,11 +60,13 @@ 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: "JisL7DeliverNoteDetail",
+  name: "OuterJisL7DeliverNoteDetail",
   mixins: [
     tableMixins,
     LoadingMixins,
@@ -78,6 +74,7 @@ export default {
     TableHeaderMixins,
     mixins,
     filterSelectMixins,
+    newAndEdiDialogMixins
   ],
   data() {
     return {
@@ -90,7 +87,6 @@ export default {
         this.defaultFieldSettingBtn(),//字段设置
         this.defaultFreshBtn(),//刷新
         this.defaultFilterBtn(),//筛选
-        this.defaultFilterForDetailBtn()//明细查询按钮
       ],
     };
   },