From f11f9c68dec05ec82cd8ce62ae46ccbaa79cf1df Mon Sep 17 00:00:00 2001
From: zhousq <zhoushaoqiang@sina.com>
Date: Fri, 19 Apr 2024 09:42:20 +0800
Subject: [PATCH 1/2] =?UTF-8?q?2024-04-19=20=E4=BF=AE=E6=94=B9detial=20?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mes/abilityInfo/index.vue     |  5 ++--
 src/views/mes/components/Detail.vue     | 40 +++++++++++++------------
 src/views/mes/dismantlingMain/index.vue |  3 +-
 src/views/mes/opersteps/index.vue       |  4 +--
 src/views/mes/operstepsType/index.vue   |  4 +--
 src/views/mes/pattern/index.vue         |  4 +--
 src/views/mes/patternType/index.vue     |  4 +--
 src/views/mes/productBackline/index.vue |  3 +-
 src/views/mes/productOffline/index.vue  |  5 ++--
 src/views/mes/reworkBatch/index.vue     |  5 ++--
 src/views/mes/reworkSingle/index.vue    |  5 ++--
 11 files changed, 45 insertions(+), 37 deletions(-)

diff --git a/src/views/mes/abilityInfo/index.vue b/src/views/mes/abilityInfo/index.vue
index f73f10e03..945375f6f 100644
--- a/src/views/mes/abilityInfo/index.vue
+++ b/src/views/mes/abilityInfo/index.vue
@@ -51,7 +51,8 @@
   />
 
   <!-- 详情 -->
-  <Detail ref="detailRef" :isBasic="true" :allSchemas="AbilityInfo.allSchemas" />
+  <Detail ref="detailRef" :isBasic="true" :isBasicMes="false" :allSchemas="AbilityInfo.allSchemas" :detailAllSchemas="AbilityInfo.allSchemas"
+  :apiPage="AbilityInfoApi.getAbilityInfoPage" />
 
   <!-- 导入 -->
   <ImportForm ref="importFormRef" url="/mes/ability-info/import" :importTemplateData="importTemplateData" @success="importSuccess" />
@@ -64,7 +65,7 @@ import * as AbilityInfoApi from '@/api/mes/abilityInfo'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
 import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
-import Detail from '@/components/Detail/src/Detail.vue'
+import Detail from '../components/Detail.vue'
 
 defineOptions({ name: 'AbilityInfo' })
 
diff --git a/src/views/mes/components/Detail.vue b/src/views/mes/components/Detail.vue
index 48a3ec50b..a5072d7e9 100644
--- a/src/views/mes/components/Detail.vue
+++ b/src/views/mes/components/Detail.vue
@@ -35,6 +35,7 @@
           :schema="allSchemas.detailSchema"
           :columns="2"
           width="200px"
+          
         />
       </ContentWrap>
       <div class="flex">
@@ -381,24 +382,24 @@ const isShowDrawer = ref(false)
 const detailLoading = ref(false)
 const tabsList = ref(JSON.parse(JSON.stringify(props.tabs ? props.tabs : '')))
 
-if (props.isBasic == true) {
-  if (tabsList.value && tabsList.value.length > 0) {
-    tabsList.value.unshift({
-      label: '详情',
-      prop: 'Detail'
-    })
-  }
-} else {
-  if (tabsList.value && tabsList.value.length > 0) {
-  } else {
-    tabsList.value = [
-      {
-        label: '明细',
-        prop: 'Detail'
-      }
-    ]
-  }
-}
+// if (props.isBasic == true || props.isBasicMes == true) {
+//   if (tabsList.value && tabsList.value.length > 0) {
+//     tabsList.value.unshift({
+//       label: '详情',
+//       prop: 'Detail'
+//     })
+//   }
+// } else {
+//   if (tabsList.value && tabsList.value.length > 0) {
+//   } else {
+//     tabsList.value = [
+//       {
+//         label: '明细',
+//         prop: 'Detail'
+//       }
+//     ]
+//   }
+// }
 
 const otherList = [...props.annexTable,{
     label:props.annexAliasLabel,
@@ -413,10 +414,11 @@ const otherList = [...props.annexTable,{
 tabsList.value = [...tabsList?.value,...otherList]
 
 if (!tabsList.value || tabsList.value && tabsList.value.length == otherList.length) {
+  if (props.isBasic == false && props.isBasicMes == false) {
   tabsList.value.unshift({
       label: '明细',
       prop: 'Detail'
-  })
+  })}
 }
 tabsList.value.unshift({
     label: '主数据',
diff --git a/src/views/mes/dismantlingMain/index.vue b/src/views/mes/dismantlingMain/index.vue
index b41931c64..c4c87bdf8 100644
--- a/src/views/mes/dismantlingMain/index.vue
+++ b/src/views/mes/dismantlingMain/index.vue
@@ -53,6 +53,7 @@
   <!-- 详情 -->
   <Detail ref="detailRef"
           :isBasic="false"
+          :isBasicMes="true" 
           :allSchemas="DismantlingMain.allSchemas"
           :detailAllSchemas="DismantlingDetail.allSchemas"
           :detailAllSchemasRules="DismantlingDetailRules"
@@ -80,7 +81,7 @@ import * as DismantlingDetailApi from '@/api/mes/dismantlingDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
 import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
-import Detail from '@/components/Detail/src/Detail.vue'
+import Detail from '../components/Detail.vue'
 
 defineOptions({ name: 'MesDismantlingMain' })
 
diff --git a/src/views/mes/opersteps/index.vue b/src/views/mes/opersteps/index.vue
index 896b1659e..4e2c1abc8 100644
--- a/src/views/mes/opersteps/index.vue
+++ b/src/views/mes/opersteps/index.vue
@@ -51,7 +51,7 @@
   />
 
   <!-- 详情 -->
-  <Detail ref="detailRef" :isBasic="true" :allSchemas="Opersteps.allSchemas" />
+  <Detail ref="detailRef"  :allSchemas="Opersteps.allSchemas" :isBasic="false" :isBasicMes="true"  :detailAllSchemas="Opersteps.allSchemas"   :apiPage="OperstepsApi.getOperstepsPage" />
 
   <!-- 导入 -->
   <ImportForm ref="importFormRef" url="/mes/opersteps/import" :importTemplateData="importTemplateData" @success="importSuccess" />
@@ -64,7 +64,7 @@ import * as OperstepsApi from '@/api/mes/opersteps'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
 import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
-import Detail from '@/components/Detail/src/Detail.vue'
+import Detail from '../components/Detail.vue'
 
 defineOptions({ name: 'Opersteps' })
 
diff --git a/src/views/mes/operstepsType/index.vue b/src/views/mes/operstepsType/index.vue
index 7079cc3f5..20c4d9940 100644
--- a/src/views/mes/operstepsType/index.vue
+++ b/src/views/mes/operstepsType/index.vue
@@ -51,7 +51,7 @@
   />
 
   <!-- 详情 -->
-  <Detail ref="detailRef" :isBasic="true" :allSchemas="OperstepsType.allSchemas" />
+  <Detail ref="detailRef" :allSchemas="OperstepsType.allSchemas" :isBasic="false" :isBasicMes="true"  :detailAllSchemas="OperstepsType.allSchemas"   :apiPage="OperstepsTypeApi.getOperstepsTypePage"/>
 
   <!-- 导入 -->
   <ImportForm ref="importFormRef" url="/mes/opersteps-type/import" :importTemplateData="importTemplateData" @success="importSuccess" />
@@ -64,7 +64,7 @@ import * as OperstepsTypeApi from '@/api/mes/operstepsType'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
 import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
-import Detail from '@/components/Detail/src/Detail.vue'
+import Detail from '../components/Detail.vue'
 
 defineOptions({ name: 'OperstepsType' })
 
diff --git a/src/views/mes/pattern/index.vue b/src/views/mes/pattern/index.vue
index 7d201886a..e7a6f128d 100644
--- a/src/views/mes/pattern/index.vue
+++ b/src/views/mes/pattern/index.vue
@@ -51,7 +51,7 @@
   />
 
   <!-- 详情 -->
-  <Detail ref="detailRef" :isBasic="true" :allSchemas="Pattern.allSchemas" />
+  <Detail ref="detailRef"  :allSchemas="Pattern.allSchemas" :isBasic="false" :isBasicMes="true"  :detailAllSchemas="Pattern.allSchemas"   :apiPage="PatternApi.getPatternPage" />
 
   <!-- 导入 -->
   <ImportForm ref="importFormRef" url="/mes/pattern/import" :importTemplateData="importTemplateData" @success="importSuccess" />
@@ -64,7 +64,7 @@ import * as PatternApi from '@/api/mes/pattern'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
 import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
-import Detail from '@/components/Detail/src/Detail.vue'
+import Detail from '../components/Detail.vue'
 
 defineOptions({ name: 'Pattern' })
 
diff --git a/src/views/mes/patternType/index.vue b/src/views/mes/patternType/index.vue
index acedd71fe..6a1ad681a 100644
--- a/src/views/mes/patternType/index.vue
+++ b/src/views/mes/patternType/index.vue
@@ -51,7 +51,7 @@
   />
 
   <!-- 详情 -->
-  <Detail ref="detailRef" :isBasic="true" :allSchemas="PatternType.allSchemas" />
+  <Detail ref="detailRef" :allSchemas="PatternType.allSchemas" :isBasic="false" :isBasicMes="true"  :detailAllSchemas="PatternType.allSchemas"   :apiPage="PatternTypeApi.getPatternTypePage"/>
 
   <!-- 导入 -->
   <ImportForm ref="importFormRef" url="/mes/pattern-type/import" :importTemplateData="importTemplateData" @success="importSuccess" />
@@ -64,7 +64,7 @@ import * as PatternTypeApi from '@/api/mes/patternType'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
 import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
-import Detail from '@/components/Detail/src/Detail.vue'
+import Detail from '../components/Detail.vue'
 
 defineOptions({ name: 'PatternType' })
 
diff --git a/src/views/mes/productBackline/index.vue b/src/views/mes/productBackline/index.vue
index 1dc6d58fb..f3b9da7b4 100644
--- a/src/views/mes/productBackline/index.vue
+++ b/src/views/mes/productBackline/index.vue
@@ -51,7 +51,8 @@
   />
 
   <!-- 详情 -->
-  <Detail ref="detailRef" :isBasic="true" :allSchemas="ProductBackline.allSchemas" />
+  <Detail ref="detailRef" :allSchemas="ProductBackline.allSchemas" :isBasic="false"  :isBasicMes="true"  :detailAllSchemas="ProductBackline.allSchemas"
+  :apiPage="ProductBacklineApi.getProductBacklinePage"/>
 
   <!-- 导入 -->
   <ImportForm ref="importFormRef" url="/mes/product-backline/import" :importTemplateData="importTemplateData" @success="importSuccess" />
diff --git a/src/views/mes/productOffline/index.vue b/src/views/mes/productOffline/index.vue
index 6f96689ef..3d07a2172 100644
--- a/src/views/mes/productOffline/index.vue
+++ b/src/views/mes/productOffline/index.vue
@@ -51,7 +51,8 @@
   />
 
   <!-- 详情 -->
-  <Detail ref="detailRef" :isBasic="true" :allSchemas="ProductOffline.allSchemas" />
+  <Detail ref="detailRef" :isBasic="false" :isBasicMes="false" :allSchemas="ProductOffline.allSchemas"  :detailAllSchemas="ProductOffline.allSchemas"
+  :apiPage="ProductOfflineApi.getProductOfflinePage"/>
 
   <!-- 导入 -->
   <ImportForm ref="importFormRef" url="/mes/product-offline/import" :importTemplateData="importTemplateData" @success="importSuccess" />
@@ -64,7 +65,7 @@ import * as ProductOfflineApi from '@/api/mes/productOffline'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
 import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
-import Detail from '@/components/Detail/src/Detail.vue'
+import Detail from '../components/Detail.vue'
 
 defineOptions({ name: 'MesProductOffline' })
 
diff --git a/src/views/mes/reworkBatch/index.vue b/src/views/mes/reworkBatch/index.vue
index f2b515fd3..d081b8355 100644
--- a/src/views/mes/reworkBatch/index.vue
+++ b/src/views/mes/reworkBatch/index.vue
@@ -51,7 +51,8 @@
   />
 
   <!-- 详情 -->
-  <Detail ref="detailRef" :isBasic="true" :allSchemas="ReworkBatch.allSchemas" />
+  <Detail ref="detailRef" :allSchemas="ReworkBatch.allSchemas" :isBasic="false"  :isBasicMes="false"  :detailAllSchemas="ReworkBatch.allSchemas"
+  :apiPage="ReworkBatchApi.getReworkBatchPage"/>
 
   <!-- 导入 -->
   <ImportForm ref="importFormRef" url="/mes/rework-batch/import" :importTemplateData="importTemplateData" @success="importSuccess" />
@@ -64,7 +65,7 @@ import * as ReworkBatchApi from '@/api/mes/reworkBatch'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
 import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
-import Detail from '@/components/Detail/src/Detail.vue'
+import Detail from '../components/Detail.vue'
 
 defineOptions({ name: 'MesReworkBatch' })
 
diff --git a/src/views/mes/reworkSingle/index.vue b/src/views/mes/reworkSingle/index.vue
index 3fe6a7eb8..a5254d728 100644
--- a/src/views/mes/reworkSingle/index.vue
+++ b/src/views/mes/reworkSingle/index.vue
@@ -51,7 +51,8 @@
   />
 
   <!-- 详情 -->
-  <Detail ref="detailRef" :isBasic="true" :allSchemas="ReworkSingle.allSchemas" />
+  <Detail ref="detailRef" :isBasic="false" :allSchemas="ReworkSingle.allSchemas" :isBasicMes="false"  :detailAllSchemas="ReworkSingle.allSchemas"
+  :apiPage="ReworkSingleApi.getReworkSinglePage"/>
 
   <!-- 导入 -->
   <ImportForm ref="importFormRef" url="/mes/rework-single/import" :importTemplateData="importTemplateData" @success="importSuccess" />
@@ -64,7 +65,7 @@ import * as ReworkSingleApi from '@/api/mes/reworkSingle'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
 import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
-import Detail from '@/components/Detail/src/Detail.vue'
+import Detail from '../components/Detail.vue'
 
 defineOptions({ name: 'MesReworkSingle' })
 

From 8c6435bc13055b9785cf74824c6fd7369d353825 Mon Sep 17 00:00:00 2001
From: zhousq <zhoushaoqiang@sina.com>
Date: Fri, 19 Apr 2024 09:47:39 +0800
Subject: [PATCH 2/2] =?UTF-8?q?2024-04-19=20=E7=A6=BB=E7=BA=BF=E7=99=BB?=
 =?UTF-8?q?=E8=AE=B0=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mes/productBackline/index.vue             | 2 +-
 src/views/mes/productOffline/index.vue              | 2 +-
 src/views/mes/productOffline/productOffline.data.ts | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/views/mes/productBackline/index.vue b/src/views/mes/productBackline/index.vue
index f3b9da7b4..9872e5958 100644
--- a/src/views/mes/productBackline/index.vue
+++ b/src/views/mes/productBackline/index.vue
@@ -65,7 +65,7 @@ import * as ProductBacklineApi from '@/api/mes/productBackline'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
 import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
-import Detail from '@/components/Detail/src/Detail.vue'
+import Detail from '../components/Detail.vue'
 
 defineOptions({ name: 'MesProductBackline' })
 
diff --git a/src/views/mes/productOffline/index.vue b/src/views/mes/productOffline/index.vue
index 3d07a2172..fa7244d44 100644
--- a/src/views/mes/productOffline/index.vue
+++ b/src/views/mes/productOffline/index.vue
@@ -51,7 +51,7 @@
   />
 
   <!-- 详情 -->
-  <Detail ref="detailRef" :isBasic="false" :isBasicMes="false" :allSchemas="ProductOffline.allSchemas"  :detailAllSchemas="ProductOffline.allSchemas"
+  <Detail ref="detailRef" :isBasic="false" :isBasicMes="true" :allSchemas="ProductOffline.allSchemas"  :detailAllSchemas="ProductOffline.allSchemas"
   :apiPage="ProductOfflineApi.getProductOfflinePage"/>
 
   <!-- 导入 -->
diff --git a/src/views/mes/productOffline/productOffline.data.ts b/src/views/mes/productOffline/productOffline.data.ts
index 07249e267..95a1784df 100644
--- a/src/views/mes/productOffline/productOffline.data.ts
+++ b/src/views/mes/productOffline/productOffline.data.ts
@@ -27,6 +27,7 @@ export const ProductOffline = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'offlineCode',
     sort: 'custom',
     isForm: false,
+    fixed: 'left'
   },
   {
     label: '产品编码',