Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into master_hella

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' })
 

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 (props.isBasic == true || props.isBasicMes == true) {
-  if (tabsList.value && tabsList.value.length > 0) {
+//   if (tabsList.value && tabsList.value.length > 0) {
-    tabsList.value.unshift({
+//     tabsList.value.unshift({
-      label: '详情',
+//       label: '详情',
-      prop: 'Detail'
+//       prop: 'Detail'
-    })
+//     })
-  }
+//   }
-} else {
+// } else {
-  if (tabsList.value && tabsList.value.length > 0) {
+//   if (tabsList.value && tabsList.value.length > 0) {
-  } else {
+//   } else {
-    tabsList.value = [
+//     tabsList.value = [
-      {
+//       {
-        label: '明细',
+//         label: '明细',
-        prop: 'Detail'
+//         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: '主数据',

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' })
 

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' })
 

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' })
 

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' })
 

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' })
 

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" />
@@ -64,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' })
 

src/views/mes/productOffline/index.vue

@@ -51,7 +51,8 @@
   />
 
   <!-- 详情 -->
-  <Detail ref="detailRef" :isBasic="true" :allSchemas="ProductOffline.allSchemas" />
+  <Detail ref="detailRef" :isBasic="false" :isBasicMes="true" :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' })
 

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: '产品编码',

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' })
 

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' })