From 9781baa8f00aee623b9bfcbc271d9ac84a081e78 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Fri, 2 Feb 2024 16:50:03 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E5=B7=A5=E5=8D=95=E4=B8=BB?=
 =?UTF-8?q?=E5=AD=90=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                              |   4 +-
 .../device/deviceMaintenanceDetail/index.ts   |  38 +-
 src/components/BasicForm/src/BasicForm.vue    |  15 +-
 src/components/Detail/src/Detail.vue          | 199 +++----
 .../Detail/src/DetailDeviceLedger.vue         | 557 ++++++++++++++++++
 .../SearchTable/src/SearchTable.vue           |  89 ++-
 src/components/SearchTableItem/index.ts       |   3 +
 .../SearchTableItem/src/SearchTableItem.vue   | 144 +++++
 src/utils/disposition/tabsList.ts             |   4 +-
 src/views/eam/device/deviceAccounts/index.vue |  16 +-
 .../deviceMaintenanceMain.data.ts             |  94 ++-
 .../device/deviceMaintenanceMain/index.vue    |  85 ++-
 12 files changed, 1030 insertions(+), 218 deletions(-)
 create mode 100644 src/components/Detail/src/DetailDeviceLedger.vue
 create mode 100644 src/components/SearchTableItem/index.ts
 create mode 100644 src/components/SearchTableItem/src/SearchTableItem.vue

diff --git a/.env.development b/.env.development
index 5c1f646..66c440a 100644
--- a/.env.development
+++ b/.env.development
@@ -4,8 +4,8 @@ NODE_ENV=development
 VITE_DEV=false
 
 # 请求路径
-VITE_BASE_URL='http://localhost:12080'
-# VITE_BASE_URL='http://192.168.0.165:12080'
+# VITE_BASE_URL='http://localhost:12080'
+VITE_BASE_URL='http://192.168.0.165:12080'
 
 # 上传路径
 VITE_UPLOAD_URL='http://localhost:12080/admin-api/infra/file/upload'
diff --git a/src/api/eam/device/deviceMaintenanceDetail/index.ts b/src/api/eam/device/deviceMaintenanceDetail/index.ts
index 4e7a8b1..9ae5b49 100644
--- a/src/api/eam/device/deviceMaintenanceDetail/index.ts
+++ b/src/api/eam/device/deviceMaintenanceDetail/index.ts
@@ -1,51 +1,51 @@
 import request from '@/config/axios'
 
 export interface DeviceMaintenanceDetailVO {
-  describes: string
-  describes1: string
-  workOut: string
-  maintenances: string
+  describes: string
+  describes1: string
+  workOut: string
+  maintenances: string
 }
 
 // 查询维修工单子列表
 export const getDeviceMaintenanceDetailPage = async (params) => {
-  if (params.isSearch) {
-    delete params.isSearch
-    const data = {...params}
-    return await request.post({ url: '/wms/purchasereceipt-request-detail/senior', data })
-  } else {
-    return await request.get({ url: `/admin-api/eam/device-maintenance-detail/page`, params })
-  }
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/purchasereceipt-request-detail/senior', data })
+  } else {
+    return await request.get({ url: `/eam/device-maintenance-detail/page`, params })
+  }
 }
 
 // 查询维修工单子详情
-export const getPurchasereceiptRequestDetail = async (id: number) => {
-  return await request.get({ url: `/eam/device-maintenance-detail/get?id=` + id })
+export const getPurchasereceiptRequestDetail = async (id) => {
+  return await request.get({ url: `/eam/device-maintenance-detail/selectListByNumber?id=` + id })
 }
 
 // 新增维修工单子
 export const createDeviceMaintenanceDetail = async (data: DeviceMaintenanceDetailVO) => {
-  return await request.post({ url: `/eam/device-maintenance-detail/create`, data })
+  return await request.post({ url: `/eam/device-maintenance-detail/create`, data })
 }
 
 // 修改维修工单子
 export const updateDeviceMaintenanceDetail = async (data: DeviceMaintenanceDetailVO) => {
-  return await request.put({ url: `/eam/device-maintenance-detail/update`, data })
+  return await request.put({ url: `/eam/device-maintenance-detail/update`, data })
 }
 
 // 删除维修工单子
 export const deleteDeviceMaintenanceDetail = async (id: number) => {
-  return await request.delete({ url: `/eam/device-maintenance-detail/delete?id=` + id })
+  return await request.delete({ url: `/eam/device-maintenance-detail/delete?id=` + id })
 }
 
 
 
 // 导出维修工单子 Excel
 export const exportPurchasereceiptRequestDetail = async (params) => {
-  return await request.download({ url: `/wms/purchasereceipt-request-detail/export-excel`, params })
+  return await request.download({ url: `/wms/purchasereceipt-request-detail/export-excel`, params })
 }
 
 // 下载用户导入模板
 export const importTemplate = () => {
-  return request.download({ url: '/wms/purchasereceipt-request-detail/get-import-template' })
-}
\ No newline at end of file
+  return request.download({ url: '/wms/purchasereceipt-request-detail/get-import-template' })
+}
diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue
index b957c36..5dd561e 100644
--- a/src/components/BasicForm/src/BasicForm.vue
+++ b/src/components/BasicForm/src/BasicForm.vue
@@ -104,10 +104,12 @@
       <ButtonBase :Butttondata="Butttondata" @button-base-click="buttonBaseClick" />
     </template>
   </Dialog>
-  <SearchTable ref="searchTableRef" @searchTableSuccess="searchTableSuccess" />
+  <SearchTableItem ref="searchTableRef" v-if="isSearchTableItem" @searchTableSuccess="searchTableSuccess" />
+  <SearchTable ref="searchTableRef" v-else @searchTableSuccess="searchTableSuccess" />
 </template>
 <script setup lang="ts">
 import { SearchTable } from '@/components/SearchTable'
+import { SearchTableItem } from '@/components/SearchTableItem'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import ButtonBase from '@/components/XButton/src/ButtonBase.vue'
 import TableForm from '@/components/TableForm/src/TableForm.vue'
@@ -232,6 +234,12 @@ const props = defineProps({
     required: false,
     default: null
   },
+  // 是否是选择备件列表
+  isSearchTableItem: {
+    type: Boolean,
+    required: false,
+    default: false
+  },
 })
 
 const { t } = useI18n() // 国际化
@@ -360,12 +368,11 @@ const open = async (type: string, row?: any, masterParmas?: any) => {
   if (masterParmas) {
     if (!row) {
       row = {
-        masterId: masterParmas.masterId,
-        number: masterParmas.number
+        maintenanceNumber: masterParmas.maintenanceNumber,
       }
     }
   }
-  if (row?.id || row?.masterId) {
+  if (row?.id || row?.maintenanceNumber) {
     formLoading.value = true
     try {
       nextTick(() => {
diff --git a/src/components/Detail/src/Detail.vue b/src/components/Detail/src/Detail.vue
index 5a22384..4d041b5 100644
--- a/src/components/Detail/src/Detail.vue
+++ b/src/components/Detail/src/Detail.vue
@@ -33,7 +33,7 @@
           <TableHead
             v-if="!isBasic"
             :HeadButttondata="HeadButttondata"
-            :masterId="masterParmas.masterId"
+            :number="masterParmas.maintenanceNumber"
             @button-base-click="buttonBaseClick"
             :routeName="routeName"
             @searchFormClick="searchFormClick"
@@ -72,8 +72,14 @@
             v-model:pageSize="tableObjectRef.pageSize"
             v-model:currentPage="tableObjectRef.currentPage"
           >
-          <template #photos="{ row }">
-             <div v-for="(item,index) in row.photos.split(',')" :key="index" style="color:#409eff ; cursor: pointer;" @click="openImage(item)">{{ item }}</div>
+            <template #photos="{ row }">
+              <div
+                v-for="(item, index) in row.photos.split(',')"
+                :key="index"
+                style="color: #409eff; cursor: pointer"
+                @click="openImage(item)"
+                >{{ item }}</div
+              >
             </template>
             <template #action="{ row }">
               <ButtonBase
@@ -117,21 +123,19 @@
       @selectChangeDetail="selectChangeDetail"
       :formTypeDetail="formTypeDetail"
       :countPlanAllList="countPlanAllList"
+      :isSearchTableItem="isSearchTableItem"
     />
   </div>
 </template>
 
 <script lang="ts" setup>
-// import Annex from '@/components/Annex/src/Annex.vue'
-// import Remarks from '@/components/Remarks/src/Remarks.vue'
-// import ChangeRecord from '@/components/ChangeRecord/src/ChangeRecord.vue'
 import Tabs from '@/components/Tabs/src/Tabs.vue'
-// import * as RemarkApi from '@/api/wms/remark'
-// import * as FileApi from '@/api/wms/file'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
 import DetailTable from '@/components/DetailTable/src/DetailTable.vue'
+import { isString } from '@/utils/is'
+import { Console } from 'console'
 
 defineOptions({ name: 'Detail' })
 
@@ -239,7 +243,7 @@ const props = defineProps({
   buttondataTable: {
     type: Array,
     required: false,
-    default: ()=>{
+    default: () => {
       return []
     }
   },
@@ -256,11 +260,17 @@ const props = defineProps({
     default: null
   },
   // 子列表 新增 编辑 删除的展示与隐藏，默认展示
-  detailButtonIsShow:{
+  detailButtonIsShow: {
     type: Boolean,
     required: false,
     default: false
-  }
+  },
+  // 是否是选择备件列表
+  isSearchTableItem: {
+    type: Boolean,
+    required: false,
+    default: false
+  },
 })
 const isShowDrawer = ref(false)
 const detailLoading = ref(false)
@@ -287,8 +297,6 @@ if (props.isBasic == true) {
 if (tabsList.value) {
 }
 
-
-
 // Tabs当前选择
 const current = ref(0)
 const change = (item, index) => {
@@ -298,9 +306,9 @@ const change = (item, index) => {
 
 //主表所需的参数
 const masterParmas = ref({
-  masterId: '', //主表id
-  number: '', //主表单据号
-  status: '' //主表状态 用于控制子表新增编辑按钮显示情况
+  maintenanceNumber: '' //主表id
+  // number: '', //主表单据号
+  // status: '' //主表状态 用于控制子表新增编辑按钮显示情况
 })
 
 // 列表头部按钮
@@ -318,11 +326,11 @@ const openDetail = async (row: any, titleName: any, titleValue: any, tableName:
   // 加载明细列表
   if (!props.isBasic) {
     // 设置主表id
-    masterParmas.value.masterId = row.id
-    masterParmas.value.number = row.number
-    masterParmas.value.status = row.status
+    masterParmas.value.maintenanceNumber = row.number
+    // masterParmas.value.number = row.number
+    // masterParmas.value.status = row.status
     tableObjectRef.value.params = {
-      masterId: row.id
+      maintenanceNumber: row.number
     }
     await getList()
   }
@@ -331,66 +339,26 @@ const openDetail = async (row: any, titleName: any, titleValue: any, tableName:
     detailLoading.value = true
     try {
       detailData.value = row
-      getRemarkList()
-      getFileList()
-      getChangeRecordList()
-      // 判断详情新增按钮是否显示
-      if (routeName.value.indexOf('Job') > -1) {
-        HeadButttondata.value = [
-          defaultButtons.defaultFilterBtn(null) // 筛选
-        ]
-      } else {
-        if(!props.detailButtonIsShow){
-          HeadButttondata.value = [
-            defaultButtons.defaultAddBtn({
-              hide: isShowMainButton(row, ['1'])
-            }), // 新增
-            defaultButtons.defaultFilterBtn(null) // 筛选
-          ]
-        }
-        //盘点计划详情筛选
-        if (props.fromeWhere == 'countPlan') {
-          HeadButttondata.value = [
-            defaultButtons.defaultAddBtn({
-              hide: isShowMainButton(row, ['1'])
-            }) // 新增
-          ]
-        }
-         //盘点计划详情筛选
-         if (props.fromeWhere == 'putawayRequest') {
-          HeadButttondata.value = [
-          defaultButtons.defaultFilterBtn(null) // 筛选
-          ]
-        }
-         //盘点调整申请筛选
-         if (props.fromeWhere == 'countadjustRequest') {
-          HeadButttondata.value = [
-          defaultButtons.defaultFilterBtn(null) // 筛选
-          ]
-        }
-         //采购收货详情筛选
-         if (props.fromeWhere == 'purchasereceipt') {
-          HeadButttondata.value = [
-          defaultButtons.defaultFilterBtn(null) // 筛选
-          ]
-        }
-        //客户收货详情筛选
-        if (props.fromeWhere == 'customerreceipt') {
-          HeadButttondata.value = [
-          defaultButtons.defaultFilterBtn(null) // 筛选
-          ]
-        }
-      }
+      setBeiJian()
 
+      let detailButtonAdd: any = []
+      detailButtonAdd = [
+        defaultButtons.defaultAddBtn({
+          hide: isShowMainButton(row, ['1'])
+        })
+      ]
+      HeadButttondata.value = [...detailButtonAdd]
       // 动态显示操作列按钮
-      if(!props.detailButtonIsShow){
-        buttondata.value = [...[
-          defaultButtons.mainListEditBtn({
-            hide: isShowMainButton(row, ['1'])
-          }), // 编辑
-          defaultButtons.mainListDeleteBtn({
-            hide: isShowMainButton(row, ['1'])
-          })], // 删除
+      if (!props.detailButtonIsShow) {
+        buttondata.value = [
+          ...[
+            defaultButtons.mainListEditBtn({
+              hide: isShowMainButton(row, ['1'])
+            }), // 编辑
+            defaultButtons.mainListDeleteBtn({
+              hide: isShowMainButton(row, ['1'])
+            })
+          ], // 删除
           ...props.buttondataTable
         ]
       }
@@ -399,9 +367,23 @@ const openDetail = async (row: any, titleName: any, titleValue: any, tableName:
     }
   }
 }
-defineExpose({ openDetail }) // 提供 open 方法，用于打开弹窗
-
-
+// 设置备件回显
+const setBeiJian = () => {
+  let isItemNUmbersTrue = false
+  isItemNUmbersTrue = detailAllSchemasRef.value.tableColumns.some(
+    (item) => item.field == 'itemNumbers1'
+  )
+  if (!isItemNUmbersTrue) return
+  tableObjectRef.value.tableList.forEach((item) => {
+    if (item.itemNumbers?.length > 0) {
+      let str = ''
+      item.itemNumbers.forEach((element) => {
+        str += element.name + ':' + element.qty + ','
+      })
+      item.itemNumbers1 = str.substring(0, str.length - 1)
+    }
+  })
+}
 const tableObjectRef = ref()
 const tableMethodsRef = ref()
 const detailAllSchemasRef = ref()
@@ -416,11 +398,7 @@ detailAllSchemasRef.value = props.detailAllSchemas
 
 // 根据状态返回该按钮是否显示
 const isShowMainButton = (row, val) => {
-  if (val.indexOf(row.status) > -1) {
-    return false
-  } else {
-    return true
-  }
+  return false
 }
 
 // 获得表格的各种操作
@@ -463,33 +441,36 @@ const buttonTableClick = async (val, row) => {
     // 删除
     handleDelete(row.id)
   } else {
-    emit('tableFormButton',val, row)
+    emit('tableFormButton', val, row)
   }
 }
 /** 添加/修改操作 */
 const formRef = ref()
 const openForm = async (type: string, row?: number) => {
+  if (row) {
+    if (detailAllSchemasRef.value?.tableColumns?.length > 0) {
+      let isTrue = false
+      let isItemNUmbersTrue = false
+      isTrue = detailAllSchemasRef.value.tableColumns.some((item) => item.field == 'maintenances')
+      isItemNUmbersTrue = detailAllSchemasRef.value.tableColumns.some(
+        (item) => item.field == 'itemNumbers'
+      )
+      if (isTrue) {
+        if (row.maintenances && isString(row.maintenances)) {
+          row.maintenances = row.maintenances.split(',').map(Number)
+        }
+      }
+    }
+  }
+
   formRef.value.open(type, row, masterParmas.value)
 }
 // form 提交
 const submitForm = async (formType, data) => {
   try {
-    // 子表新增编辑校验 如果业务需要子表提交校验 需在主页详情组件添加 detailValidate 参数及方法
-    const rs = (await props.detailValidate) ? props.detailValidate(data) : true
-    if (!rs) return
-    if (formType === 'create') {
-      await props.apiCreate(data)
-      message.success(t('common.createSuccess'))
-    } else {
-      await props.apiUpdate(data)
-      message.success(t('common.updateSuccess'))
-    }
-    formRef.value.dialogVisible = false
-    // 刷新当前列表
-    await getList()
-    updateKey.value += 1
+    emit('detailSubmitForm', formType, data, getList, formRef.value)
   } finally {
-    formRef.value.formLoading = false
+    // formRef.value.formLoading = false
   }
 }
 
@@ -504,7 +485,8 @@ const emit = defineEmits([
   'selectChangeDetail',
   'detailOpenForm',
   'tableFormButton',
-  'openImage'
+  'openImage',
+  'detailSubmitForm'
 ])
 /** 删除按钮操作 */
 const handleDelete = async (id: number) => {
@@ -517,6 +499,7 @@ const handleDelete = async (id: number) => {
     // 刷新列表
     await getList()
     updateKey.value += 1
+    setBeiJian()
   } catch {}
 }
 // 筛选提交
@@ -528,7 +511,7 @@ const searchFormClick = async (searchData) => {
     isSearch: true,
     filters: searchData.filters
       ? searchData.filters
-      : [{ column: 'masterId', action: '==', value: masterParmas.value.masterId }]
+      : [{ column: 'number', action: '==', value: masterParmas.value.maintenanceNumber }]
   }
   detailAllSchemasRef.value = props.detailAllSchemas
   tableObjectRef.value = tableObject
@@ -550,9 +533,11 @@ const selectChangeDetail = (field, val) => {
   emit('selectChangeDetail', field, val)
 }
 // 打开图片
-const openImage=(item)=>{
+const openImage = (item) => {
   emit('openImage', item)
 }
+
+defineExpose({ openDetail, tableObject }) // 提供 open 方法，用于打开弹窗
 //监视属性
 watch(
   () => props.apiPage,
@@ -560,10 +545,10 @@ watch(
     const { tableObject, tableMethods } = useTable({
       getListApi: props.apiPage // 分页接口
     })
-    tableObject.params.masterId = masterParmas.value.masterId
+    tableObject.params.maintenanceNumber = masterParmas.value.maintenanceNumber
     detailAllSchemasRef.value = props.detailAllSchemas
     if (props.tableObjectExtend) {
-      props.tableObjectExtend.forEach(item => {
+      props.tableObjectExtend.forEach((item) => {
         tableObject.params[item.key] = item.value
       })
     }
diff --git a/src/components/Detail/src/DetailDeviceLedger.vue b/src/components/Detail/src/DetailDeviceLedger.vue
new file mode 100644
index 0000000..2a13d8a
--- /dev/null
+++ b/src/components/Detail/src/DetailDeviceLedger.vue
@@ -0,0 +1,557 @@
+<template>
+  <div>
+    <el-drawer
+      v-model="isShowDrawer"
+      title="详情"
+      direction="rtl"
+      size="80%"
+      v-loading="detailLoading"
+    >
+      <template #header>
+        <div class="font-size-18px">
+          {{ titleValueRef }} <span class="ml-20px font-size-16px">{{ titleNameRef }}</span>
+        </div>
+      </template>
+      <ContentWrap>
+        <Descriptions
+          :data="detailData"
+          labelClassName="label-class-name"
+          label-align="left"
+          direction="vertical"
+          :column="8"
+          :schema="allSchemas.detailSchema"
+          :columns="2"
+          width="200px"
+        />
+      </ContentWrap>
+
+      <Tabs :tabsList="tabsList" :current="current" @change="change" />
+      <div class="flex">
+        <!-- 详情 -->
+        <ContentWrap class="w-[100%]">
+          <!-- 列表头部 -->
+          <TableHead
+            v-if="!isBasic"
+            :HeadButttondata="HeadButttondata"
+            :number="masterParmas.number"
+            @button-base-click="buttonBaseClick"
+            :routeName="routeName"
+            @searchFormClick="searchFormClick"
+            :allSchemas="detailAllSchemas"
+          />
+          <!-- 默认单表展现 -->
+          <Descriptions
+            v-if="isBasic && !tabsExtend"
+            :data="detailData"
+            :schema="allSchemas.detailSchema"
+            :columns="2"
+          />
+          <!-- 单表切换tabs 展现table -->
+          <Table
+            v-if="isBasic && tabsExtend"
+            :columns="detailAllSchemasRef.tableColumns"
+            :data="tableObjectRef.tableList"
+            :loading="tableObjectRef.loading"
+            :pagination="{ total: tableObjectRef.total }"
+            v-model:pageSize="tableObjectRef.pageSize"
+            v-model:currentPage="tableObjectRef.currentPage"
+          >
+            <!-- <template #action="{ row }">
+              <ButtonBase
+                :Butttondata="buttondata"
+                @button-base-click="buttonTableClick($event, row)"
+              />
+            </template> -->
+          </Table>
+          <Table
+            v-if="!isBasic && fromeWhere != 'countPlan'"
+            :columns="detailAllSchemasRef.tableColumns"
+            :data="tableObjectRef.tableList"
+            :loading="tableObjectRef.loading"
+            :pagination="{ total: tableObjectRef.total }"
+            v-model:pageSize="tableObjectRef.pageSize"
+            v-model:currentPage="tableObjectRef.currentPage"
+          >
+          <template #photos="{ row }">
+             <div v-for="(item,index) in row.photos.split(',')" :key="index" style="color:#409eff ; cursor: pointer;" @click="openImage(item)">{{ item }}</div>
+            </template>
+            <template #action="{ row }">
+              <ButtonBase
+                :Butttondata="buttondata"
+                @button-base-click="buttonTableClick($event, row)"
+              />
+            </template>
+          </Table>
+          <DetailTable
+            v-if="!isBasic && fromeWhere == 'countPlan' && isShowDrawer"
+            :columns="detailAllSchemasRef.tableColumns"
+            :data="tableObjectRef.tableList"
+            :allList="allList"
+            :countScopeType="countScopeType"
+            :key="updateKey"
+          >
+            <template #action="{ row }">
+              <ButtonBase
+                :Butttondata="buttondata"
+                @button-base-click="buttonTableClick($event, row)"
+              />
+            </template>
+          </DetailTable>
+        </ContentWrap>
+      </div>
+    </el-drawer>
+    <!-- 表单弹窗：添加/修改 -->
+    <BasicForm
+      ref="formRef"
+      @success="submitForm"
+      :rules="detailAllSchemasRules"
+      :formAllSchemas="detailAllSchemas"
+      :isBusiness="false"
+      :apiUpdate="apiUpdate"
+      :apiCreate="apiCreate"
+      :fromeWhere="fromeWhere"
+      :isDetail="true"
+      @searchTableSuccess="searchTableSuccess"
+      :detailData="detailData"
+      @submitForm="submitForm"
+      @selectChangeDetail="selectChangeDetail"
+      :formTypeDetail="formTypeDetail"
+      :countPlanAllList="countPlanAllList"
+    />
+  </div>
+</template>
+
+<script lang="ts" setup>
+import Tabs from '@/components/Tabs/src/Tabs.vue'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
+import TableHead from '@/components/TableHead/src/TableHead.vue'
+import DetailTable from '@/components/DetailTable/src/DetailTable.vue'
+
+defineOptions({ name: 'Detail' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+routeName.value = routeName.value.substring(0, routeName.value.length - 4) + 'Detail'
+const updateKey = ref(0)
+
+const props = defineProps({
+  // 标签参数
+  tabs: {
+    type: Object,
+    required: true,
+    default: null
+  },
+  // 是否是基础数据 展现详情顶部表单
+  isBasic: {
+    type: Boolean,
+    required: false,
+    default: false
+  },
+  // 表单，列表 相关信息
+  allSchemas: {
+    type: Object,
+    required: true,
+    default: null
+  },
+  // 明细列表相关信息
+  detailAllSchemas: {
+    type: Object,
+    required: true,
+    default: null
+  },
+  //  明细验证
+  detailAllSchemasRules: {
+    type: Object,
+    required: true,
+    default: null
+  },
+  // 子表新增API
+  apiCreate: {
+    type: Function,
+    required: false,
+    default: null
+  },
+  // 子表编辑API
+  apiUpdate: {
+    type: Function,
+    required: false,
+    default: null
+  },
+  // 子表分页列表API
+  apiPage: {
+    type: Function,
+    required: false,
+    default: null
+  },
+  // 子表删除API
+  apiDelete: {
+    type: Function,
+    required: false,
+    default: null
+  },
+  // 子表新增修改校验
+  detailValidate: {
+    type: Function,
+    required: false,
+    default: null
+  },
+  // 来源 countPlan盘点计划进入
+  fromeWhere: {
+    type: String,
+    required: false,
+    default: ''
+  },
+  // 获取接口列表集合
+  allList: {
+    type: Object,
+    required: true,
+    default: null
+  },
+  // 盘点范围类型
+  countScopeType: {
+    type: Array,
+    required: false,
+    default: null
+  },
+  //盘点详情子表新增的时候判断盘点范围值显示输入框还是下拉框
+  formTypeDetail: {
+    type: String,
+    required: false,
+    default: 'InputString'
+  },
+  //盘点详情子表新增的时候判断盘点范围值的下拉列表
+  countPlanAllList: {
+    type: Array,
+    required: false,
+    default: null
+  },
+  // 详情列表扩展操作按钮
+  buttondataTable: {
+    type: Array,
+    required: false,
+    default: ()=>{
+      return []
+    }
+  },
+  // 针对基础数据tabs扩展 显示table列表 默认false
+  tabsExtend: {
+    type: Boolean,
+    required: false,
+    default: false
+  },
+  // tableObject 数据过滤条件 针对 详情扩展标签页 传入不同条件
+  tableObjectExtend: {
+    type: Array,
+    required: false,
+    default: null
+  },
+  // 子列表 新增 编辑 删除的展示与隐藏，默认展示
+  detailButtonIsShow:{
+    type: Boolean,
+    required: false,
+    default: false
+  }
+})
+const isShowDrawer = ref(false)
+const detailLoading = ref(false)
+const tabsList = ref(JSON.parse(JSON.stringify(props.tabs ? props.tabs : '')))
+
+
+
+// Tabs当前选择
+const current = ref(0)
+const change = (item, index) => {
+  current.value = index
+  emit('changeTabs', item)
+}
+
+//主表所需的参数
+const masterParmas = ref({
+  number: '', //主表id
+  // number: '', //主表单据号
+  // status: '' //主表状态 用于控制子表新增编辑按钮显示情况
+})
+
+// 列表头部按钮
+const HeadButttondata = ref()
+// 列表-操作按钮
+const buttondata = ref()
+
+/** 打开弹窗 */
+const detailData = ref()
+const titleNameRef = ref()
+const titleValueRef = ref()
+const openDetail = async (row: any, titleName: any, titleValue: any, tableName: any) => {
+  titleNameRef.value = titleName
+  titleValueRef.value = titleValue
+  // 加载明细列表
+  if (!props.isBasic) {
+    // 设置主表id
+    masterParmas.value.number = row.number
+    // masterParmas.value.number = row.number
+    // masterParmas.value.status = row.status
+    tableObjectRef.value.params = {
+      number: row.number
+    }
+    await getList()
+  }
+  isShowDrawer.value = true
+  if (row) {
+    detailLoading.value = true
+    try {
+      detailData.value = row
+      // 判断详情新增按钮是否显示
+      if (routeName.value.indexOf('Job') > -1) {
+        HeadButttondata.value = [
+          defaultButtons.defaultFilterBtn(null) // 筛选
+        ]
+      } else {
+        if(!props.detailButtonIsShow){
+          HeadButttondata.value = [
+            defaultButtons.defaultAddBtn({
+              hide: isShowMainButton(row, ['1'])
+            }), // 新增
+            defaultButtons.defaultFilterBtn(null) // 筛选
+          ]
+        }
+        //盘点计划详情筛选
+        if (props.fromeWhere == 'countPlan') {
+          HeadButttondata.value = [
+            defaultButtons.defaultAddBtn({
+              hide: isShowMainButton(row, ['1'])
+            }) // 新增
+          ]
+        }
+         //盘点计划详情筛选
+         if (props.fromeWhere == 'putawayRequest') {
+          HeadButttondata.value = [
+          defaultButtons.defaultFilterBtn(null) // 筛选
+          ]
+        }
+         //盘点调整申请筛选
+         if (props.fromeWhere == 'countadjustRequest') {
+          HeadButttondata.value = [
+          defaultButtons.defaultFilterBtn(null) // 筛选
+          ]
+        }
+         //采购收货详情筛选
+         if (props.fromeWhere == 'purchasereceipt') {
+          HeadButttondata.value = [
+          defaultButtons.defaultFilterBtn(null) // 筛选
+          ]
+        }
+        //客户收货详情筛选
+        if (props.fromeWhere == 'customerreceipt') {
+          HeadButttondata.value = [
+          defaultButtons.defaultFilterBtn(null) // 筛选
+          ]
+        }
+      }
+
+      // 动态显示操作列按钮
+      if(!props.detailButtonIsShow){
+        buttondata.value = [...[
+          defaultButtons.mainListEditBtn({
+            hide: isShowMainButton(row, ['1'])
+          }), // 编辑
+          defaultButtons.mainListDeleteBtn({
+            hide: isShowMainButton(row, ['1'])
+          })], // 删除
+          ...props.buttondataTable
+        ]
+      }
+    } finally {
+      detailLoading.value = false
+    }
+  }
+}
+defineExpose({ openDetail }) // 提供 open 方法，用于打开弹窗
+
+
+const tableObjectRef = ref()
+const tableMethodsRef = ref()
+const detailAllSchemasRef = ref()
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: props.apiPage // 分页接口
+})
+
+tableObjectRef.value = tableObject
+tableMethodsRef.value = tableMethods
+detailAllSchemasRef.value = props.detailAllSchemas
+
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row, val) => {
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
+// 获得表格的各种操作
+const { getList } = tableMethodsRef.value
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') {
+    // 新增
+    openForm('create')
+  } else if (val == 'import') {
+    // 导入
+    handleImport()
+  } else if (val == 'export') {
+    // 导出
+    handleExport()
+  } else if (val == 'refresh') {
+    // 刷新
+    getList()
+  } else if (val == 'filtrate') {
+    // 筛选
+  } else {
+    // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 字段设置 更新主列表字段
+// const updataTableColumns = (val) => {
+//   detailAllSchemas.tableColumns.value = val
+// }
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') {
+    // 编辑
+    openForm('update', row)
+    emit('detailOpenForm', row)
+  } else if (val == 'delete') {
+    // 删除
+    handleDelete(row.id)
+  } else {
+    emit('tableFormButton',val, row)
+  }
+}
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm = async (type: string, row?: number) => {
+  formRef.value.open(type, row, masterParmas.value)
+}
+// form 提交
+const submitForm = async (formType, data) => {
+  try {
+    // 子表新增编辑校验 如果业务需要子表提交校验 需在主页详情组件添加 detailValidate 参数及方法
+    const rs = (await props.detailValidate) ? props.detailValidate(data) : true
+    if (!rs) return
+    if (formType === 'create') {
+      await props.apiCreate(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await props.apiUpdate(data)
+      message.success(t('common.updateSuccess'))
+    }
+    formRef.value.dialogVisible = false
+    // 刷新当前列表
+    await getList()
+    updateKey.value += 1
+  } finally {
+    formRef.value.formLoading = false
+  }
+}
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef) => {
+  emit('searchTableSuccessDetail', formField, searchField, val, formRef)
+}
+// 传递给父类
+const emit = defineEmits([
+  'searchTableSuccessDetail',
+  'changeTabs',
+  'selectChangeDetail',
+  'detailOpenForm',
+  'tableFormButton',
+  'openImage'
+])
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await props.apiDelete(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+    updateKey.value += 1
+  } catch {}
+}
+// 筛选提交
+const searchFormClick = async (searchData) => {
+  const { tableObject, tableMethods } = useTable({
+    getListApi: props.apiPage // 分页接口
+  })
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+      ? searchData.filters
+      : [{ column: 'number', action: '==', value: masterParmas.value.number }]
+  }
+  detailAllSchemasRef.value = props.detailAllSchemas
+  tableObjectRef.value = tableObject
+  tableMethodsRef.value = tableMethods
+  tableObjectRef.value.tableList = []
+  const { getList } = tableMethods
+  await getList()
+  updateKey.value += 1
+  // tableObjectRef.value.params = {
+  //   isSearch: true,
+  //   filters: searchData.filters
+  //     ? searchData.filters
+  //     : [{ column: 'masterId', action: '==', value: masterParmas.value.masterId }]
+  // }
+  // getList() // 刷新当前列表
+}
+// 选择盘点类型的时候针对限值的操作
+const selectChangeDetail = (field, val) => {
+  emit('selectChangeDetail', field, val)
+}
+// 打开图片
+const openImage=(item)=>{
+  emit('openImage', item)
+}
+//监视属性
+watch(
+  () => props.apiPage,
+  () => {
+    const { tableObject, tableMethods } = useTable({
+      getListApi: props.apiPage // 分页接口
+    })
+    tableObject.params.number = masterParmas.value.number
+    detailAllSchemasRef.value = props.detailAllSchemas
+    if (props.tableObjectExtend) {
+      props.tableObjectExtend.forEach(item => {
+        tableObject.params[item.key] = item.value
+      })
+    }
+    tableObjectRef.value = tableObject
+    tableMethodsRef.value = tableMethods
+    const { getList } = tableMethods
+    getList()
+  }
+)
+</script>
+<style lang="scss">
+.el-drawer__body {
+  background: #f5f5f5 !important;
+}
+
+::v-deep(.label-class-name) {
+  color: #dedede;
+}
+</style>
+<style scoped lang="scss"></style>
diff --git a/src/components/SearchTable/src/SearchTable.vue b/src/components/SearchTable/src/SearchTable.vue
index 21b96b7..299c107 100644
--- a/src/components/SearchTable/src/SearchTable.vue
+++ b/src/components/SearchTable/src/SearchTable.vue
@@ -1,20 +1,31 @@
 <template>
   <Dialog :title="dialogTitle" v-model="searchDialogVisible" :width="'80%'">
-    
+    <!-- 搜索工作栏 -->
+    <!-- <Search :schema="searchSchema" @search="setSearchParamsRef" @reset="setSearchParamsRef" /> -->
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      :routeName="routeName"
+      @searchFormClick="searchFormClick"
+      :allSchemas="allSchemasRef"
+    />
     <ContentWrap>
       <Table
         ref="searchTableRef"
         :columns="tableColumns"
         :data="tableObjectRef.tableList"
         :loading="tableObjectRef.loading"
+        :pagination="{
+          total: tableObjectRef.total
+        }"
+        v-model:pageSize="tableObjectRef.pageSize"
+        v-model:currentPage="tableObjectRef.currentPage"
+        v-model:sort="tableObjectRef.sort"
         :selection="true"
         :reserveSelection="true"
-        row-key="number"
-      >
-      <template #qty="{ row }">
-        <el-input v-model="row.qty" type="number" placeholder="请输入数量" />
-      </template>
-    </Table>
+        row-key="id"
+      />
     </ContentWrap>
     <template #footer>
       <div class="flex items-center">
@@ -38,15 +49,15 @@ const searchDialogVisible = ref(false) // 弹窗的是否展示
 const dialogTitle = ref('') // 弹窗的标题
 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
 
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultFilterBtn(null), // 筛选
+]
 
 /** 打开弹窗 */
 const getListRef = ref()
 const setSearchParamsRef = ref()
-const tableObjectRef = ref({
-  tableList:'',
-  loading:false,
-  params:{}
-})
+const tableObjectRef = ref()
 const getPage:any = ref()
 const searchSchema = ref()
 const tableColumns = ref()
@@ -61,7 +72,6 @@ const open = (titleName: any, allSchemas: any,getApiPage: any, formField: any, s
   searchDialogVisible.value = true
   formFieldRef.value = formField
   searchFieldRef.value = searchField
-  
   allSchemasRef.value = allSchemas
   searchSchema.value = allSchemas.searchSchema
   tableColumns.value = allSchemas.tableColumns.filter(item => (item.field !== 'action'))
@@ -69,20 +79,53 @@ const open = (titleName: any, allSchemas: any,getApiPage: any, formField: any, s
   typeRef.value = type
   rowRef.value = row
   multipleBol.value = multiple
+  // dialogTitle.value = t('action.' + type)
   dialogTitle.value = titleName
-  const getList = async () => {
-   await  getPage.value().then((res)=>{
-    tableObjectRef.value.tableList = res
+  const {tableObject, tableMethods } = useTable({
+    getListApi: getPage.value // 分页接口
   })
+  tableObjectRef.value = tableObject
   searchConditionRef.value = searchCondition
   if (searchCondition) tableObjectRef.value.params = searchCondition;
-  }
-    console.log(tableObjectRef.value)
 
+  // 获得表格的各种操作
+  const { getList } = tableMethods
+  // setSearchParamsRef.value = setSearchParams
+  setSearchParamsRef.value = tableObject.params
+  getListRef.value = getList
   getList()
 }
 
-
+// 筛选提交
+const searchFormClick = (searchData) => {
+  // console.log(99, rowRef.value)
+  // console.log(100, searchData)
+  // console.log(101, searchConditionRef.value)
+  // 20240104 修改 判断 当前弹窗 是否有条件 如果有条件 需拼接到 筛选中 searchData.filters 
+  if (searchConditionRef.value) {
+    Object.keys(searchConditionRef.value).forEach(key => {
+      if (searchData.filters) {
+          searchData.filters.push({
+            action: "==",
+            column: key,
+            value: searchConditionRef.value[key]
+          })
+        // }
+      } else {
+        searchData.filters = [{
+          action: "==",
+          column: key,
+          value: searchConditionRef.value[key]
+        }]
+      }
+    });
+  }
+  tableObjectRef.value.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getListRef.value() // 刷新当前列表
+}
 
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 
@@ -110,15 +153,9 @@ const submitForm = async () => {
       return
     }
   }
-  let isQtyNone = selections.filter(item=>!item.qty)
-  if(isQtyNone&&isQtyNone.length>0){
-    message.warning('请填写数量')
-      formLoading.value = false
-      return
-  }
+ 
   try {
     searchDialogVisible.value = false
-    console.log(selections)
     // 发送操作成功的事件
     emit('searchTableSuccess', formFieldRef.value, searchFieldRef.value, selections, typeRef.value, rowRef.value)
   } finally {
diff --git a/src/components/SearchTableItem/index.ts b/src/components/SearchTableItem/index.ts
new file mode 100644
index 0000000..c1bfdc4
--- /dev/null
+++ b/src/components/SearchTableItem/index.ts
@@ -0,0 +1,3 @@
+import SearchTableItem from './src/SearchTableItem.vue'
+
+export { SearchTableItem }
diff --git a/src/components/SearchTableItem/src/SearchTableItem.vue b/src/components/SearchTableItem/src/SearchTableItem.vue
new file mode 100644
index 0000000..b4321f3
--- /dev/null
+++ b/src/components/SearchTableItem/src/SearchTableItem.vue
@@ -0,0 +1,144 @@
+<template>
+  <Dialog :title="dialogTitle" v-model="searchDialogVisible" :width="'80%'">
+    <ContentWrap>
+      <Table
+        ref="searchTableRef"
+        :columns="tableColumns"
+        :data="tableObjectRef.tableList"
+        :loading="tableObjectRef.loading"
+        :selection="true"
+        :reserveSelection="true"
+        row-key="number"
+      >
+        <template #qty="{ row }">
+          <el-input v-model="row.qty" type="number" placeholder="请输入数量" />
+        </template>
+      </Table>
+    </ContentWrap>
+    <template #footer>
+      <div class="flex items-center">
+        <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
+        <el-button @click="searchDialogVisible = false">取 消</el-button>
+      </div>
+    </template>
+  </Dialog>
+</template>
+<script setup lang="ts">
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+
+// const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+
+const searchDialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+
+/** 打开弹窗 */
+const getListRef = ref()
+const setSearchParamsRef = ref()
+const tableObjectRef = ref({
+  tableList: '',
+  loading: false,
+  params: {}
+})
+const getPage: any = ref()
+const searchSchema = ref()
+const tableColumns = ref()
+const formFieldRef = ref()
+const searchFieldRef = ref()
+const typeRef = ref()
+const rowRef = ref()
+const allSchemasRef = ref()
+const multipleBol = ref(false)
+const searchConditionRef = ref()
+const open = (
+  titleName: any,
+  allSchemas: any,
+  getApiPage: any,
+  formField: any,
+  searchField: any,
+  multiple: any,
+  type: any,
+  row: any,
+  searchCondition: any,
+  isCountRequestRe: any
+) => {
+  searchDialogVisible.value = true
+  formFieldRef.value = formField
+  searchFieldRef.value = searchField
+
+  allSchemasRef.value = allSchemas
+  searchSchema.value = allSchemas.searchSchema
+  tableColumns.value = allSchemas.tableColumns.filter((item) => item.field !== 'action')
+  getPage.value = getApiPage
+  typeRef.value = type
+  rowRef.value = row
+  multipleBol.value = multiple
+  dialogTitle.value = titleName
+  const getList = async () => {
+    await getPage.value(searchCondition).then((res) => {
+      tableObjectRef.value.tableList = res
+    })
+  }
+  console.log(tableObjectRef.value)
+
+  getList()
+}
+
+
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+
+// Table 组件 ref
+const searchTableRef = ref()
+
+/** 提交表单 */
+const emit = defineEmits(['searchTableSuccess']) // 定义 searchTableSuccess 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 提交请求
+  formLoading.value = true
+  const selections = searchTableRef.value.selections
+  // 如果不是多选的
+  if (!multipleBol.value) {
+    if (selections.length > 1 || selections.length == 0) {
+      message.warning('请选择一条数据！')
+      formLoading.value = false
+      return
+    }
+    // 多选
+  } else {
+    if (selections.length == 0) {
+      message.warning('至少选择一条数据！')
+      formLoading.value = false
+      return
+    }
+  }
+  let isQtyNone = selections.filter((item) => !item.qty)
+  if (isQtyNone && isQtyNone.length > 0) {
+    message.warning('请填写数量')
+    formLoading.value = false
+    return
+  }
+  try {
+    searchDialogVisible.value = false
+    console.log(selections)
+    // 发送操作成功的事件
+    emit(
+      'searchTableSuccess',
+      formFieldRef.value,
+      searchFieldRef.value,
+      selections,
+      typeRef.value,
+      rowRef.value
+    )
+  } finally {
+    formLoading.value = false
+  }
+}
+</script>
+<style scoped lang="scss">
+</style>
\ No newline at end of file
diff --git a/src/utils/disposition/tabsList.ts b/src/utils/disposition/tabsList.ts
index a7f0bf1..e88f418 100644
--- a/src/utils/disposition/tabsList.ts
+++ b/src/utils/disposition/tabsList.ts
@@ -1,5 +1,5 @@
-// 页面tabs标签
-export const ItemBasicTabsList = [{
+// 设备台账tabs标签
+export const DeviceLedgerTabsList = [{
   label: "设备信息",
   prop: 'info',
 },
diff --git a/src/views/eam/device/deviceAccounts/index.vue b/src/views/eam/device/deviceAccounts/index.vue
index dc1958e..c2e4176 100644
--- a/src/views/eam/device/deviceAccounts/index.vue
+++ b/src/views/eam/device/deviceAccounts/index.vue
@@ -49,6 +49,7 @@
     @searchTableSuccess="searchTableSuccess"
     :isBusiness="false"
   />
+  
 
   <SearchTable
     ref="searchTableRef"
@@ -57,12 +58,11 @@
   />
 
   <!-- 详情 -->
-  <!-- <Detail ref="detailRef" :isBasic="true" :allSchemas="DeviceAccounts.allSchemas" /> -->
-  <Detail 
+  <DetailDeviceLedger 
     ref="detailRef" 
-    :tabs="ItemBasicTabsList" 
+    :tabs="DeviceLedgerTabsList" 
     :isBasic="true" 
-    :allSchemas="DeviceAccounts.allSchemas" 
+    :allSchemas="allSchemas" 
     @changeTabs="changeTabs"
     :detailAllSchemas="detailAllSchemas" 
     :apiPage="apiPage"
@@ -81,10 +81,10 @@ import { Item } from '@/views/eam/basic/item/item.data'
 import { createDeviceItemBatch,getDeviceItemPage } from '@/api/eam/basic/rel'
 import * as DeviceAccountsApi from '@/api/eam/device/deviceAccounts'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-import { ItemBasicTabsList } from '@/utils/disposition/tabsList'
+import { DeviceLedgerTabsList } from '@/utils/disposition/tabsList'
 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 DetailDeviceLedger from '@/components/Detail/src/DetailDeviceLedger.vue'
 import * as ItemApi from '@/api/eam/basic/item'
 
 defineOptions({ name: 'DeviceAccounts' })
@@ -98,6 +98,10 @@ const deviceNumber = ref();
 routeName.value = route.name
 const tableColumns = ref(DeviceAccounts.allSchemas.tableColumns)
 
+const allSchemas = ref(Item.allSchemas)
+const detailAllSchemas = ref()
+const apiPage = ref()
+
 // 查询页面返回
 const searchTableSuccess = (formField, searchField, val, formRef) => {
   nextTick(() => {
diff --git a/src/views/eam/device/deviceMaintenanceMain/deviceMaintenanceMain.data.ts b/src/views/eam/device/deviceMaintenanceMain/deviceMaintenanceMain.data.ts
index a49f750..39eda72 100644
--- a/src/views/eam/device/deviceMaintenanceMain/deviceMaintenanceMain.data.ts
+++ b/src/views/eam/device/deviceMaintenanceMain/deviceMaintenanceMain.data.ts
@@ -40,10 +40,13 @@ export const DeviceMaintenanceMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: '150',
     },
+    isForm: false,
+    isSearch: true,
+    isTable: true,
   },
 
   {
-    label: '设备',
+    label: '设备模具编号',
     field: 'deviceNumber',
     sort: 'custom',
     table: {
@@ -202,55 +205,32 @@ export const DeviceMaintenanceDetail = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'describes',
     sort: 'custom',
     table: {
-      width: '150',
     },
-    isForm: false,
     isSearch: false,
-    isTable: false,
   },
   {
     label: '故障真因',
     field: 'describes1',
     sort: 'custom',
     table: {
-      width: '150',
     },
-    isForm: false,
     isSearch: false,
-    isTable: false,
   },
   {
     label: '解决措施',
     field: 'workOut',
     sort: 'custom',
     table: {
-      width: '150',
     },
-    isForm: false,
     isSearch: false,
-    isTable: false,
   },
   {
     label: '维修人',
     field: 'maintenances',
     sort: 'custom',
-    table: {
-      width: '150',
-    },
     api: () => userList,
-    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
-      return userList.find((account) => account.id == cellValue)?.name
-    },
-    search: {
-      show: true,
-      component: 'Select',
-      api: () => userList,
-      componentProps: {
-        optionsAlias: {
-          labelField: 'name',
-          valueField: 'id'
-        }
-      }
+    formatter: (_: Recordable, __: TableColumn, cellValue) => {
+      return userList.filter(item=>cellValue.includes(item.id)).map(cur=>cur.name).join(',')
     },
     tableForm: {
       type: 'Select',
@@ -262,19 +242,31 @@ export const DeviceMaintenanceDetail = useCrudSchemas(reactive<CrudSchema[]>([
         labelField: 'name',
         valueField: 'id'
       }
+    },
+    form:{
+      component: 'Select',
+      api: () => userList,
+      componentProps: {
+        multiple:true,
+        collapseTags:true,
+        collapseTagsTooltip:true,
+        optionsAlias: {
+          labelField: 'name',
+          valueField: 'id'
+        }
+      }
     }
   },
   {
     label: '备件',
-    field: 'itemNUmbers',
+    field: 'itemNumbers1',
     sort: 'custom',
     table: {
-      width: '150',
     },
     tableForm:{
       isInpuFocusShow: true, // 开启查询弹窗
       searchListPlaceholder: '请选择备件',
-      searchField: 'itemNUmbers',
+      searchField: 'itemNumbers1',
       searchTitle: '备件',
       multiple:true,
       searchAllSchemas: ItemSearchTable.allSchemas,
@@ -286,10 +278,48 @@ export const DeviceMaintenanceDetail = useCrudSchemas(reactive<CrudSchema[]>([
         isMainValue: true
       }]
     },
-    isForm: false,
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择备件', // 输入框占位文本
+        searchField: 'itemNumbers1', // 查询弹窗赋值字段
+        searchTitle: '备件', // 查询弹窗标题
+        multiple:true,
+        searchAllSchemas:  ItemSearchTable.allSchemas, // 查询弹窗所需类
+        searchPage:  ItemApi.getItemList, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'deviceNumber',
+          value: 'deviceNumber',
+          message: '请选择设备模具编号！',
+          isMainValue: true
+        }]
+      }
+    },
     isSearch: false,
-    isTable: false,
   },
+  {
+    label: '备件1',
+    field: 'itemNumbers',
+    sort: 'custom',
+    table: {
+    },
+    isForm:false,
+    isDetail:false,
+    isTable:false,
+    isSearch: false,
+    isTableForm: false,
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 300,
+      fixed: 'right'
+    },
+    isDetail:false
+  }
 ]))
 // 表单校验
 export const DeviceMaintenanceDetailRules = reactive({
@@ -297,5 +327,5 @@ export const DeviceMaintenanceDetailRules = reactive({
   describes1: [required],
   workOut: [required],
   maintenance: [required],
-  itemNUmbers: [required],
+  itemNumbers: [required],
 })
\ No newline at end of file
diff --git a/src/views/eam/device/deviceMaintenanceMain/index.vue b/src/views/eam/device/deviceMaintenanceMain/index.vue
index 6ed691b..5905a94 100644
--- a/src/views/eam/device/deviceMaintenanceMain/index.vue
+++ b/src/views/eam/device/deviceMaintenanceMain/index.vue
@@ -61,24 +61,27 @@
     @handleDeleteTable="handleDeleteTable"
     @searchTableSuccess="searchTableSuccess"
     @submitForm="submitForm"
+      :isSearchTableItem="true"
   />
 
   <!-- 详情 -->
   <!-- <Detail ref="detailRef" :isBasic="true" :allSchemas="DeviceMaintenanceMain.allSchemas" /> -->
   <Detail
     ref="detailRef"
-    :isBasic="true"
+    :isBasic="false"
     :allSchemas="DeviceMaintenanceMain.allSchemas"
     :detailAllSchemas="DeviceMaintenanceDetail.allSchemas"
     :detailAllSchemasRules="DeviceMaintenanceDetailRules"
-    :apiCreate="DeviceMaintenanceDetailApi.createPurchasereturnRequestDetail"
-    :apiUpdate="DeviceMaintenanceDetailApi.updatePurchasereturnRequestDetail"
-    :apiPage="DeviceMaintenanceDetailApi.getPurchasereturnRequestDetailPage"
-    :apiDelete="DeviceMaintenanceDetailApi.deletePurchasereturnRequestDetail"
+    :apiCreate="DeviceMaintenanceDetailApi.createDeviceMaintenanceDetail"
+    :apiUpdate="DeviceMaintenanceDetailApi.updateDeviceMaintenanceDetail"
+    :apiPage="DeviceMaintenanceDetailApi.getDeviceMaintenanceDetailPage"
+    :apiDelete="DeviceMaintenanceDetailApi.deleteDeviceMaintenanceDetail"
     :Echo="Echo"
     @searchTableSuccessDetail="searchTableSuccessDetail"
     @detailOpenForm="detailOpenForm"
     :detailValidate="detailValidate"
+    @detailSubmitForm="detailSubmitForm"
+      :isSearchTableItem="true"
   />
 
   <!-- 导入 -->
@@ -120,20 +123,19 @@ const tableData = ref([])
 const updataTableColumns = (val) => {
   tableColumns.value = val
 }
-const itemNUmbers = ref()
 // 查询页面返回
 const searchTableSuccess = (formField, searchField, val, formRef, type, row) => {
   nextTick(() => {
     if (type == 'tableForm') {
       // 明细查询页赋值
-      if (formField == 'itemNUmbers') {
+      if (formField == 'itemNumbers') {
         let str = ''
         val.forEach((element) => {
           str += element.name + ':' + element.qty + ','
         })
         str = str.substring(0, str.length - 1)
-        row['itemNUmbers'] = str
-        row['itemNUmbers1'] = val
+        row['itemNumbers1'] = str
+        row['itemNumbers'] = val 
       }
     } else {
       // const setV = {}
@@ -149,12 +151,15 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef) => {
   nextTick(() => {
     const setV = {}
     setV[formField] = val[0][searchField]
-    if (formField == 'itemCode') {
-      setV['itemCode'] = val[0]['code']
-    } else {
-      setV['poNumber'] = val[0]['number']
-      setV['poLine'] = val[0]['lineNumber']
-    }
+    if (formField == 'itemNumbers1') {
+      let str = ''
+        val.forEach((element) => {
+          str += element.name + ':' + element.qty + ','
+        })
+        str = str.substring(0, str.length - 1)
+        setV['itemNumbers'] = val
+        setV['itemNumbers1'] = str
+    } 
     formRef.setValues(setV)
   })
 }
@@ -186,6 +191,7 @@ const buttonBaseClick = (val, item) => {
   if (val == 'add') {
     // 新增
     DeviceMaintenanceMain.allSchemas.formSchema[3].value = 'DEVICE'
+    DeviceMaintenanceMain.allSchemas.formSchema[0].componentProps.disabled = false
     openForm('create')
   } else if (val == 'import') {
     // 导入
@@ -242,10 +248,11 @@ const onChange = (field, cur, item) => {
   if (field == 'deviceNumber') {
     // DeviceMaintenanceMain.allSchemas.formSchema[1].componentProps.disabled = true
     // DeviceMaintenanceMain.allSchemas.formSchema[2].componentProps.disabled = true
-    formRef.value.formRef.formModel.factoryAreaNumber = Number(
-      item.componentProps.options.find((item) => item.number == cur).factoryAreaNumber
-    )
-    formRef.value.formRef.formModel.maintenance = String(userStore?.getUser?.id)
+    formRef.value.formRef.formModel.factoryAreaNumber =String(item.componentProps.options.find((item) => item.number == cur).factoryAreaNumber)
+    console.log(typeof formRef.value.formRef.formModel.factoryAreaNumber)
+    // console.log(item)
+    // console.log(item.componentProps.options)
+    formRef.value.formRef.formModel.maintenance = Number(userStore?.getUser?.id)
   }
 }
 // 列表-操作按钮事件
@@ -369,7 +376,7 @@ const submitForm = async (formType, data) => {
     return {
       describes: item.describes,
       describes1: item.describes1,
-      itemNUmbers: item.itemNUmbers1,
+      itemNumbers: item.itemNumbers1,
       maintenances: item.maintenances.join(','),
       workOut: item.workOut,
     }
@@ -417,6 +424,7 @@ const detailOpenForm = (type, row) =>{
 }
 // 子表新增/编辑校验
 const detailValidate = (data) => {
+  return true;
   let tag = false;
   if(data.qty <= 0){
     message.warning('数量必须大于0')
@@ -427,6 +435,43 @@ const detailValidate = (data) => {
     return tag;
   }
 }
+// 子表提交
+const detailSubmitForm= async (formType,data,getList,formRef,tableList) => {
+  try {
+    let data1 = {
+      id:data.id,
+      maintenanceNumber:data.maintenanceNumber,
+      describes:data.describes,
+      describes1:data.describes1,
+      itemNumbers:data.itemNumbers,
+      maintenances:data.maintenances.join(','),
+      workOut:data.workOut,
+    }
+    console.log(data1)
+  if (formType === 'create') {
+      await DeviceMaintenanceDetailApi.createDeviceMaintenanceDetail(data1)
+      message.success(t('common.createSuccess'))
+    } else {
+      await DeviceMaintenanceDetailApi.updateDeviceMaintenanceDetail(data1)
+      message.success(t('common.updateSuccess'))
+    }
+    formRef.dialogVisible = false
+    // 刷新当前列表
+    await getList()
+    detailRef.value.tableObject.tableList.forEach(item=>{
+      if (item.itemNumbers?.length>0) {
+        let str = ''
+        item.itemNumbers.forEach(element => {
+          str += element.name + ':' + element.qty + ','
+        })
+        item.itemNumbers1 = str.substring(0, str.length - 1)
+      }
+
+    })
+  } finally {
+    formRef.formLoading = false
+  }
+}
 
 /** 初始化 **/
 onMounted(async () => {