diff --git a/src/components/BasicForm/src/BasicFormQmsCode.vue b/src/components/BasicForm/src/BasicFormQmsCode.vue
deleted file mode 100644
index 03ef9e308..000000000
--- a/src/components/BasicForm/src/BasicFormQmsCode.vue
+++ /dev/null
@@ -1,696 +0,0 @@
-<template>
-  <Dialog
-    :title="dialogTitle"
-    v-model="dialogVisible"
-    :width="dialogWidth"
-    :close-on-click-modal="false"
-    :vLoading="formLoading"
-  >
-  
-  <div 
-    style="max-height: 60vh;overflow-y: auto;">
-    <Form
-      ref="formRef"
-      :rules="rules"
-      :schema="formSchema"
-      :is-col="true"
-      @opensearchTable="opensearchTable"
-      @onChange="onChange"
-      @onBlur="onBlur"
-    >
-      <template #crontab="formSchema" v-if="fromeWhere == 'countPlan'">
-        <crontab v-model="formSchema.crontab" />
-      </template>
-      <template #type="formSchema" v-if="fromeWhere == 'countPlan'">
-        <el-select
-          v-model="formSchema.type"
-          placeholder="选择盘点类型"
-          @change="selectChange('type', $event)"
-          v-if="!isDetail"
-        >
-          <el-option
-            v-for="dict in getStrDictOptions(DICT_TYPE.COUNT_TYPE)"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-        <el-select
-          v-model="formSchema.type"
-          placeholder="选择盘点范围类型"
-          @change="selectChangeDetail('type', $event,formSchema)"
-          v-if="isDetail"
-        >
-          <el-option
-            v-for="dict in getStrDictOptions(DICT_TYPE.COUNT_SCOPE_TYPE)"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </template>
-      <template #value="formSchema" v-if="fromeWhere == 'countPlan'">
-        <el-select
-          v-model="formSchema.value"
-          placeholder="选择盘点范围值"
-          v-if="isDetail&& formTypeDetail =='Select'"
-        >
-          <el-option
-            v-for="dict in countPlanAllList"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-        <el-input v-model="formSchema.value" v-if="isDetail && formTypeDetail =='InputString'"/>
-      </template>
-    </Form>
-    <div class="table" v-if="isBusiness && formType == 'create' && fromeWhere != 'countPlan'">
-      <TableForm
-        ref="tableFormRef"
-        class="w-[100%]"
-        :tableFields="tableAllSchemas.tableFormColumns"
-        :tableData="tableData"
-        :tableFormRules="tableFormRules"
-        :isShowButton="isShowButton"
-        :isShowReduceButton="isShowReduceButton"
-        @handleAddTable="handleAddTable"
-        @handleDeleteTable="handleDeleteTable"
-        @tableSelectionChange="tableSelectionChange"
-        @extendedButtonsClick="extendedButtonsClick"
-        @formSelectChange="formSelectChange"
-        @formSelectvVisibleChange="formSelectvVisibleChange"
-        @tableSortChange="tableSortChange"
-        @selectCallback="selectCallback"
-        @handleTableSelect="handleTableSelect"
-        @inpuFocus="inpuFocus"
-        @buttonOperationClick="buttonOperationClick"
-        @inputStringBlur="inputStringBlur"
-        @inputNumberChange="inputNumberChange"
-        @tableFormSelectOnBlur="tableFormSelectOnBlur"
-        @formFormDateChange="formFormDateChange"
-      />
-    </div>
-    <div v-if="isBusiness && formType == 'create' && fromeWhere == 'countPlan'">
-      <TableFormCountPlan 
-        :tableFields="tableAllSchemas.tableFormColumns"
-        :tableData="tableData"
-        :countScopeType="countScopeType"
-        :tableFormRules="tableFormRules"
-        ref="tableFormRef"
-        @tableFormChange="tableFormChange"
-        @handleAddTable="handleAddTable"
-        @handleDeleteTable="handleDeleteTable"
-      />
-    </div>
-  </div>
-    <template #footer>
-      <ButtonBase :Butttondata="Butttondata" @button-base-click="buttonBaseClick" />
-    </template>
-  
-  </Dialog>
-  <SearchTable ref="searchTableRef" @searchTableSuccess="searchTableSuccess" />
-</template>
-<script setup lang="ts">
-import { SearchTable } from '@/components/SearchTable'
-import * as defaultButtons from '@/utils/disposition/defaultButtons'
-import ButtonBase from '@/components/XButton/src/ButtonBase.vue'
-import TableForm from '@/components/TableForm/src/TableForm.vue'
-import TableFormCountPlan from '@/components/TableFormCountPlan/src/TableFormCountPlan.vue'
-import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
-
-const props = defineProps({
-  // 显示窗口宽度设置
-  basicFormWidth: {
-    type: String,
-    default: ''
-  },
-  // 是否显示TableForm 新增/删除按钮
-  isShowButton: {
-    type: Boolean,
-    default: true
-  },
-  // 是否显示tableForm 删除按钮
-  isShowReduceButton: {
-    type: Boolean,
-    default: true
-  },
-  // 校验rules
-  rules: {
-    type: Object,
-    required: true,
-    default: null
-  },
-  // 表单，列表 相关信息
-  formAllSchemas: {
-    type: Object,
-    required: true,
-    default: null
-  },
-  // 列表 相关信息
-  tableAllSchemas: {
-    type: Array,
-    required: true,
-    default: null
-  },
-  // 列表数据
-  tableData: {
-    type: Array,
-    required: true,
-    default: null
-  },
-  tableFormRules: {
-    type: Array,
-    required: true,
-    default: null
-  },
-  // 查询参数
-  // searchTableParams: {
-  //   type: Array,
-  //   required: false,
-  //   default: null
-  // },
-  // API——Vo
-  apiVo: {
-    type: Object,
-    required: true,
-    default: null
-  },
-  //  API——创建
-  apiCreate: {
-    type: Function,
-    required: true,
-    default: null
-  },
-  //  API——编辑
-  apiUpdate: {
-    type: Function,
-    required: true,
-    default: null
-  },
-  // 是否是业务表单（区分是不显示tableForm）
-  isBusiness: {
-    type: Boolean,
-    required: true,
-    default: true
-  },
-  // 表单form
-  form: {
-    type: Object,
-    required: true,
-    default: null
-  },
-  // 详情数据
-  detailData: {
-    type: Object,
-    required: true,
-    default: null
-  },
-  // // 主表参数
-  // masterParmas: {
-  //   type: Object,
-  //   required: false,
-  //   default: null
-  // },
-  // 来源 countPlan盘点计划进入
-  fromeWhere: {
-    type: String,
-    required: false,
-    default: ''
-  },
-  // 盘点范围类型
-  countScopeType: {
-    type: Array,
-    required: false,
-    default: null
-  },
-  // 是否从详情进入
-  isDetail: {
-    type: Boolean,
-    required: false,
-    default: false
-  },
-  //盘点详情子表新增的时候判断盘点范围值显示输入框还是下拉框
-  formTypeDetail: {
-    type: String,
-    required: false,
-    default: 'InputString'
-  },
-  //盘点详情子表新增的时候判断盘点范围值的下拉列表
-  countPlanAllList: {
-    type: Array,
-    required: false,
-    default: null
-  },
-  // 窗体底部按钮 显示or隐藏：保存，关闭
-  isShowFooterButtton: {
-    type: Boolean,
-    required: false,
-    default: true
-  },
-  // 明细数据长度校验
-  tableFormDataLength: {
-    type: Boolean,
-    required: false,
-    default: true
-  },
-  // 底部按钮集合
-  footButttondata: {
-    type: Array,
-    required: false,
-    default: null
-  },
-  //是否直接展示搜索表单
-  isOpenSearchTable:{
-    type: Boolean,
-    required: false,
-    default: false
-  },
-  myFuncTypeSign:{
-    type: String,
-    required: false,
-    default: null
-  },
-})
-
-const { t } = useI18n() // 国际化
-const message = useMessage() // 消息弹窗
-const dialogWidth = ref()
-if (props.basicFormWidth) {
-  dialogWidth.value = props.basicFormWidth + '%'
-} else {
-  dialogWidth.value = props.isBusiness ? '60%' : '40%'
-}
-
-const dialogVisible = ref(false) // 弹窗的是否展示
-const dialogTitle = ref('') // 弹窗的标题
-const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
-const formType = ref('') // 表单的类型：create - 新增；update - 修改
-
-const formRef = ref() // 表单 Ref
-const formSchema = ref(props.formAllSchemas?.formSchema)
-const tableAllSchemas = ref(props.tableAllSchemas)
-const tableFormRules = ref(props.tableFormRules)
-
-// 列表-按钮
-// const buttondata = [
-//   defaultButtons.mainListEditBtn(null), // 编辑
-//   defaultButtons.mainListDeleteBtn(null)
-// ]
-// // 列表-操作按钮事件
-// const buttonTableClick = async (val, row) => {
-//   if (val == 'edit') {
-    
-//   } else if (val == 'delete') {
-   
-//   } else {
-//   }
-// }
-
-/** 弹层操作 */
-// formField form表单中的字段
-// searchField 查询列表中的字段
-// type 发起事件位置 type=tableForm 是明细中发起的 否则 为主表发起的
-// searchCondition 查询条件
-const searchTableRef = ref()
-const opensearchTable = (
-  formField,
-  searchField,
-  searchTitle,
-  searchAllSchemas,
-  searchPage,
-  searchCondition,
-  multiple,
-  type,
-  row
-) => {
-  const _searchCondition = {}
-  // 判断查询条件中，是否存在指向主表的数据
-  if (searchCondition && searchCondition.length > 0) {
-    // 转换筛选条件所需
-    let filters: any[] = []
-    for (var i=0; i< searchCondition.length; i++ ) {
-    // searchCondition.forEach((item) => {
-      // 查询条件为主表某字段，需要赋值主表数据，数据来源是详情的，赋值需要从row中获取
-      if (searchCondition[i].isMainValue) {
-        _searchCondition[searchCondition[i].key] = formRef.value.formModel[searchCondition[i].value]
-          ? formRef.value.formModel[searchCondition[i].value]
-          : props.detailData
-          ? props.detailData[searchCondition[i].value]
-          : row
-          ? row[searchCondition[i].value]
-          : ''
-        // 是否含有空参数情况
-        let isNull = false
-        if (_searchCondition[searchCondition[i].key] == '' || _searchCondition[searchCondition[i].key] == undefined) {
-          isNull = true
-        }
-        if (isNull) {
-          message.warning(searchCondition[i].message?searchCondition[i].message:'前置条件未选择！')
-          return
-        }
-      } else {
-        // 扩展 转换为筛选条件进行查询
-        if (searchCondition[i].isSearch) {
-          filters.push({
-            action: searchCondition[i].action,
-            column: searchCondition[i].key,
-            value: searchCondition[i].value
-          })
-        } else {
-          _searchCondition[searchCondition[i].key] = searchCondition[i].value
-        }
-      }
-    }
-    if (filters.length > 0) {
-      _searchCondition.isSearch = true
-      _searchCondition.filters = filters
-    }
-  }
-  const _searchTableTitle = searchTitle
-  const _searchTableAllSchemas = searchAllSchemas
-  const _searchTablePage = searchPage
-  searchTableRef.value.open(
-    _searchTableTitle,
-    _searchTableAllSchemas,
-    _searchTablePage,
-    formField,
-    searchField,
-    multiple,
-    type,
-    row,
-    _searchCondition
-  )
-}
-// 弹层确定返回所选数据
-// val ： 弹层列表row 数据
-const searchTableSuccess = (formField, searchField, val, type, row) => {
-  emit('searchTableSuccess', formField, searchField, val, formRef.value, type, row)
-}
-
-/** 打开弹窗 */
-const open = async (type: string, row?: any, masterParmas?: any, titleName?: any) => {
-  dialogVisible.value = true
-  if (titleName) {
-    dialogTitle.value = t('action.' + titleName)
-  } else {
-    dialogTitle.value = t('action.' + type)
-  }
-  formType.value = type
-  resetForm()
-  // 修改时，设置数据
-  // 如果是从主表的详情页面进图添加子表，需要添加masterId，code参数
-  if (masterParmas) {
-    if (!row) {
-      if(props.myFuncTypeSign=='InspectionStage'){
-        row = {
-          masterId: masterParmas.masterId,
-          code: masterParmas.code,
-          dynamicModifyCode: masterParmas.code,
-        }
-      }else{
-        row = {
-          masterId: masterParmas.masterId,
-          code: masterParmas.code,
-        }
-      }
-    }
-  }
-  if (row?.id || row?.masterId) {
-    formLoading.value = true
-    try {
-      nextTick(() => {
-        formRef.value.setValues(row)
-      })
-    } finally {
-      formLoading.value = false
-    }
-  }
-}
-defineExpose({ open, formRef, opensearchTable, dialogVisible, formLoading }) // 提供 open 方法，用于打开弹窗
-
-/** 弹窗按钮 */
-let Butttondata:any = []
-if (props.isShowFooterButtton) {
-  Butttondata = [
-    defaultButtons.formSaveBtn(null), // 保存
-    defaultButtons.formCloseBtn(null) // 关闭
-  ]
-}
-if (props.footButttondata) {
-  Butttondata = props.footButttondata
-}
-
-/** 按钮事件 */
-const buttonBaseClick = (val) => {
-  // 扩展 按钮事件回调
-  if (props.footButttondata) {
-    emit('footButtonClick',val)
-  } 
-   // 保存
-  else if (val == 'save') {
-    submitForm()
-  }
-  // 关闭
-  else if (val == 'close') {
-    dialogVisible.value = false
-  }
-}
-
-/** 提交表单 */
-// const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
-
-const tableFormRef = ref()
-const submitForm = async () => {
-  const elForm = unref(formRef)?.getElFormRef()
-  // 校验表单
-  if (!elForm) return
-  const valid = await elForm.validate()
-  if (!valid) return
-  // 针对主子表 明细校验
-  if (props.isBusiness) {
-    formLoading.value = true
-    if (formType.value == 'create') {
-      const validateForm = await tableFormRef.value.validateForm()
-      if (!validateForm && props.tableFormDataLength) {
-        if (props.tableData.length == 0) {
-          message.warning('请填写明细信息！')
-          formLoading.value = false
-          return
-        }
-        formLoading.value = false
-        return
-      }
-      // 主子表——提交请求
-      try {
-        const data = unref(formRef)?.formModel
-        emit('submitForm', formType.value, data)
-      } finally {
-      }
-    } else {
-      // 编辑
-      try {
-        const data = unref(formRef)?.formModel
-        emit('submitForm', formType.value, data)
-      } finally {
-      }
-    }
-  } else {
-    // 基础数据单表——提交请求
-    formLoading.value = true
-    try {
-      const data = unref(formRef)?.formModel
-      emit('success', formType.value, data)
-    } finally {
-      formLoading.value = false
-    }
-  }
-}
-
-/** 重置表单 */
-const resetForm = () => {
-  unref(formRef)?.resetFields()
-}
-
-// 传递给父类
-const emit = defineEmits([
-  'success',
-  'tableSelectionChange',
-  'tableFormSelectOnBlur',
-  'extendedButtonsClick',
-  'formSelectChange',
-  'formSelectvVisibleChange',
-  'tableSortChange',
-  'selectCallback',
-  'handleTableSelect',
-  'handleDeleteTable',
-  'handleAddTable',
-  'inpuFocus',
-  'searchTableSuccess',
-  'opensearchTable',
-  'submitForm',
-  'selectChange',
-  'selectChangeDetail',
-  'tableFormChange',
-  'buttonOperationClick',
-  'inputStringBlur',
-  'onChange',
-  'onBlur',
-  'inputNumberChange',
-  'formFormDateChange',
-  'footButtonClick'
-])
-//普通下拉改变事件
-const formSelectChange = (field, val, row) => {
-  emit('formSelectChange', field, val, row)
-}
-// 日期改变事件
-const formFormDateChange = (field, val,row, index) => {
-  emit('formFormDateChange', field, val,row, index)
-}
-const formSelectvVisibleChange = (field, val, row) => {
-  emit('formSelectvVisibleChange', field, val, row)
-}
-// 点击selection框
-const tableSelectionChange = (val) => {
-  emit('tableSelectionChange', val)
-}
-// tableform select bulr
-const tableFormSelectOnBlur = (field, val, row, index) => {
-  emit('tableFormSelectOnBlur', field, val, row, index)
-}
-// 列表排序
-const tableSortChange = (column, prop, order) => {
-  emit('tableSortChange', column, prop, order)
-}
-
-// 数字输入-改变事件
-const inputNumberChange = (field, index, row, val) => {
-  emit('inputNumberChange', field, index, row, val)
-}
-//下拉框回显方法
-// const showSelect = (val, statusID) => {
-//   return getDictForStatusID(val, statusID)
-// }
-
-// 行点击
-const handleTableSelect = (row, column, event) => {
-  emit('handleTableSelect', row, column, event)
-}
-
-// 删除数据
-const handleDeleteTable = (row, index) => {
-  emit('handleDeleteTable', row, index,formRef.value)
-}
-// 添加数据
-const handleAddTable = () => {
-  if(props.isOpenSearchTable){
-    const tableFormKeys = {}
-    tableAllSchemas.value.tableFormColumns.forEach(item => {
-      tableFormKeys[item.field] = item.default ? item.default : ''
-    })
-    inpuFocus(tableAllSchemas.value.tableFormColumns[0],tableFormKeys,0)
-  }else{
-    emit('handleAddTable')
-  }
-  
-}
-// 输入框聚焦
-const inpuFocus = (headerItem, row, index) => {
-  opensearchTable(
-    headerItem.field,
-    headerItem.tableForm.searchField,
-    headerItem.tableForm.searchTitle,
-    headerItem.tableForm.searchAllSchemas,
-    headerItem.tableForm.searchPage,
-    headerItem.tableForm.searchCondition,
-    headerItem.tableForm.multiple,
-    'tableForm',
-    row
-  )
-}
-/**
- * 监听改变事件
- * @param field 当前操作字段
- * @param cur 改变后值
- */
-const onChange = (field, cur) => {
-  emit('onChange', field, cur)
-}
-
-/**
- * 监听失焦事件
- * @param field 当前操作字段
- * @param e 
- */
-const onBlur = (field, e) => {
-  emit('onBlur', field, e)
-}
-
-// 修改盘点类型
-const selectChange = (field, val) => {
-  emit('selectChange', field, val)
-}
-// 修改盘点范围类型
-const selectChangeDetail = (field, val,formSchema) => {
-  formSchema.value = ''
-  emit('selectChangeDetail', field, val)
-}
-
-
-const tableFormChange = (field, val, row) => {
-  emit('tableFormChange', field, val, row)
-}
-
-const buttonOperationClick = (row, label, index)=> {
-  emit("buttonOperationClick", row, label, index);
-}
-
-const inputStringBlur = (headerItem, row, index)=> {
-  emit("inputStringBlur", headerItem, row, index);
-}
-
-</script>
-<style lang="scss" scoped>
-.table {
-  border: 1px solid #dedede;
-  border-radius: 8px;
-  padding: 10px;
-  width: calc(100% - 32px);
-  display: flex;
-}
-::v-deep(.el-table__body) {
-  padding: 10px 0px;
-}
-::v-deep(.el-table--default .el-table__cell) {
-  padding: 2px 0px;
-  border: none;
-}
-
-::v-deep(.el-table td.el-table__cell .el-form-item__content) {
-  display: flex !important;
-  align-items: center !important;
-  justify-content: center !important;
-}
-::v-deep(.el-table td.el-table__cell div) {
-  overflow: visible;
-}
-
-::v-deep(.el-icon) {
-  display: block;
-}button
-.button {
-  > div {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    cursor: pointer;
-
-    > div {
-      margin-left: 6px;
-      text-decoration: underline;
-      color: #409eff;
-    }
-  }
-}
-</style>
diff --git a/src/components/Detail/src/Detail.vue b/src/components/Detail/src/Detail.vue
index 9b23fd110..e589f0cdc 100644
--- a/src/components/Detail/src/Detail.vue
+++ b/src/components/Detail/src/Detail.vue
@@ -45,7 +45,7 @@
             :columns="2"
           />
           <!-- 检验工序用到插槽 -->
-          <slot v-if="isBasic && !tabsExtend" :data="detailData" name="basicBottom" :key="detailData.id"></slot>
+          <slot v-if="isBasic && !tabsExtend" :data="detailData" name="basicBottom" :key="updateKey"></slot>
           <!-- 单表切换tabs 展现table -->
           <Table
             v-if="isBasic && tabsExtend"
@@ -689,6 +689,7 @@ const openDetail = async (row: any, titleName: any, titleValue: any, tableName:
   if(tabRef.value){
     tabRef.value.changeCurrent(0)
   }
+  updateKey.value+=1
   annexTableData.value = []
   titleNameRef.value = titleName
   titleValueRef.value = titleValue
@@ -810,6 +811,7 @@ detailAllSchemasRef.value = props.detailAllSchemas
 
 // 根据状态返回该按钮是否显示
 const isShowMainButton = (row, val) => {
+  if(!val || val &&val.length == 0) return false;
   if (val.indexOf(row.status) > -1) {
     return false
   } else {
diff --git a/src/components/Detail/src/DetailQmsCode.vue b/src/components/Detail/src/DetailQmsCode.vue
deleted file mode 100644
index 819a401e1..000000000
--- a/src/components/Detail/src/DetailQmsCode.vue
+++ /dev/null
@@ -1,846 +0,0 @@
-<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 v-if="!isBasic">
-        <Descriptions
-          :data="detailData"
-          labelClassName="label-class-name"
-          label-align="left"
-          direction="vertical"
-          :column="8"
-          :schema="allSchemas.detailSchema"
-          :columns="2"
-          width="200px"
-        />
-      </ContentWrap>
-
-      <Tabs ref="tabRef" :tabsList="tabsList" :current="current" @change="change" />
-      <div class="flex">
-        <!-- 详情 -->
-        <ContentWrap class="w-[100%]" v-show="tabsList[current].label!='附件'&&tabsList[current].label!='备注'&&tabsList[current].label!='变更记录'">          <!-- 列表头部 -->
-          <TableHead
-            v-if="!isBasic"
-            :HeadButttondata="HeadButttondata"
-            :masterId="masterParmas.masterId"
-            @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>
-        <!-- 附件/备注/变更记录 -->
-        <ContentWrap class="w-[100%]" v-show="tabsList[current].label=='附件'||tabsList[current].label=='备注'||tabsList[current].label=='变更记录'" :style="{height:remarkHeight+'px'}">
-          <!-- 附件组件 -->
-          <ElScrollbar ref="scrollbar" :style="{height:(remarkHeight-40)+'px'}">
-            <Annex  v-show="tabsList[current].label=='附件'"
-              :annexData="annexData"
-              @handleAnnexSuccess="handleAnnexSuccess"
-              @deleteAnnexSuccess="deleteAnnexSuccess"
-              :upData="remarksData.data"
-            />
-            <!-- 备注组件 -->
-            <Remarks v-show="tabsList[current].label=='备注'"
-              :remarksData="remarksData"
-              class="mt-20px"
-              @remarksSubmitScuess="remarksSubmitScuess"
-            />
-            <!-- 变更记录组件 -->
-            <ChangeRecord v-show="tabsList[current].label=='变更记录'" :changeRecordData="changeRecordData" class="mt-20px" />
-          </ElScrollbar> 
-        </ContentWrap>
-      </div>
-    </el-drawer>
-    <!-- 表格弹窗 -->
-    <SearchTable ref="searchTableRef" @search-table-success="searchTableSuccess1" />
-    <!-- 表单弹窗：添加/修改 -->
-    <BasicFormQmsCode
-      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"
-      @onChange="detailBasicFormOnChange"
-      @onBlur="onBlur"
-      @formFormDateChange="formFormDateChange"
-      :myFuncTypeSign="myFuncTypeSign"
-    />
-  </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 BasicFormQmsCode from '@/components/BasicForm/src/BasicFormQmsCode.vue'
-import TableHead from '@/components/TableHead/src/TableHead.vue'
-import DetailTable from '@/components/DetailTable/src/DetailTable.vue'
-import { SearchTable } from '@/components/SearchTable'
-
-defineOptions({ name: 'DetailQmsCode' })
-
-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
-  },
-  // 子列表 筛选 展示与隐藏 ，默认展示
-  detailButtonIsShowFilter:{
-    type: Boolean,
-    required: false,
-    default: true
-  },
-  // 子列表 新增 展示与隐藏 ，默认展示
-  detailButtonIsShowAdd:{
-    type: Boolean,
-    required: false,
-    default: true
-  },
-  // 子列表 编辑 展示与隐藏 ，默认展示
-  detailButtonIsShowEdit:{
-    type: Boolean,
-    required: false,
-    default: true
-  },
-  // 子列表 删除 展示与隐藏 ，默认展示
-  detailButtonIsShowDelete:{
-    type: Boolean,
-    required: false,
-    default: true
-  },
-  //是否直接展示搜索表单
-  isOpenSearchTable:{
-    type: Boolean,
-    required: false,
-    default: false
-  },
-  //个性化功能标志
-  myFuncTypeSign:{
-    type: String,
-    required: false,
-    default: null
-  },
-})
-const isShowDrawer = ref(false)
-const detailLoading = ref(false)
-const myFuncTypeSign = props.myFuncTypeSign
-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'
-      }
-    ]
-  }
-}
-
-const otherList = []
-
-tabsList.value = [...tabsList?.value,...otherList]
-
-if (!tabsList.value || tabsList.value && tabsList.value.length == otherList.length) {
-  tabsList.value.unshift({
-      label: '明细',
-      prop: 'Detail'
-  })
-}
-
-//  Tabs 
-const tabRef = ref()
-//滚动条
-const scrollbar = ref() 
-//附件 备注 变更记录 高度计算
-const remarkHeight = computed(() => { 
-  const tab = unref(tabRef)
-  const tabTop = tab?.$el.getBoundingClientRect().top
-  const tabHeight = tab?.$el.getBoundingClientRect().height
-  console.log('tabTop',tabTop)
-  const height = window.innerHeight - (tabTop) - (tabHeight) - 60
-  return height
-})
-
-
-// 附件默认数据
-const annexData = reactive({
-  annexList: []
-})
-
-// 备注数据
-const remarksData = reactive({
-  remarksList: [],
-  data: {}
-})
-
-// 变更记录默认数据
-const changeRecordData = reactive({
-  changeRecordList: []
-})
-const detailData = ref({}) //详情数据
-// 获取附件列表篇
-const getFileList = async () => {
-  detailLoading.value = true
-  try {
-    annexData.annexList = await FileApi.getFileList(remarksData.data)
-  } finally {
-    detailLoading.value = false
-  }
-}
-/** 添加附件 */
-const handleAnnexSuccess = () => {
-  getFileList()
-  getChangeRecordList()
-}
-// 删除附件成功之后所走的方法
-const deleteAnnexSuccess = async () => {
-  getFileList()
-  getChangeRecordList()
-}
-
-// Tabs当前选择
-const current = ref(0)
-const change = (item, index) => {
-  current.value = index
-  emit('changeTabs', item)
-  if(otherList.find(other=>other.label==item.label)){
-    // 附件/备注/变更记录 -- 点击回到顶部
-    scrollbar.value.scrollTo({ top: 0});
-  }
-      
-}
-
-//主表所需的参数
-const masterParmas = ref({
-  masterId: '', //主表id
-  code: '', //主表单据号
-  status: '', //主表状态 用于控制子表新增编辑按钮显示情况
-})
-
-// 列表头部按钮
-const HeadButttondata = ref()
-// 列表-操作按钮
-const buttondata = ref()
-
-/** 表格弹窗 */
-const initModel = (schema: FormSchema[], formModel: Recordable) => {
-  const model: Recordable = { ...formModel }
-  schema.map((v) => {
-    // 如果是hidden，就删除对应的值
-    if (v.hidden) {
-      delete model[v.field]
-    } else if (v.component && v.component !== 'Divider') {
-      const hasField = Reflect.has(model, v.field)
-      // 如果先前已经有值存在，则不进行重新赋值，而是采用现有的值
-      model[v.field] = hasField ? model[v.field] : v.value !== void 0 ? v.value : ''
-    }
-  })
-  return model
-}
-const searchTableRef = ref()
-// 如果需要直接打开表格数据表单数据
-const searchTableFormModel = ref<Recordable>({})
-if(props.isOpenSearchTable){
-  searchTableFormModel.value = initModel(props.detailAllSchemas.formSchema, unref(searchTableFormModel))
-}
-const searchTableFormType = ref('') // 表单的类型：create - 新增；update - 修改
-
-/** 打开弹窗 */
-const formRef = 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.masterId = row.id
-    masterParmas.value.code = row.code
-    masterParmas.value.status = row.status
-    tableObjectRef.value.params = {
-      masterId: row.id
-    }
-    await getList()
-  }
-  isShowDrawer.value = true
-  if (row) {
-    detailLoading.value = true
-    try {
-      detailData.value = row
-      // getRemarkList()
-      // getFileList()
-      // getChangeRecordList()
-      // 判断详情按钮是否显示
-      let detailButtonFilter: any = []
-      let detailButtonAdd: any = []
-      if (props.detailButtonIsShowFilter) {
-        // 筛选
-        detailButtonFilter = [
-          defaultButtons.defaultFilterBtn(null)
-        ]
-      }
-      if (props.detailButtonIsShowAdd) {
-        // 新增
-        detailButtonAdd = [
-          defaultButtons.defaultAddBtn({
-            hide: isShowMainButton(row, ['1'])
-          })
-        ]
-      }
-      HeadButttondata.value = [...detailButtonFilter,...detailButtonAdd]
-
-      // 针对特殊处理 当业务是任务的 只显示筛选 正常情况下应在业务页面设置 后期再作优化
-      if (routeName.value.indexOf('Job') > -1) {
-        HeadButttondata.value = [
-          defaultButtons.defaultFilterBtn(null) // 筛选
-        ]
-      }
-
-      let detailButtonEdit: any = []
-      let detailButtonDelete: any = []
-      if (props.detailButtonIsShowEdit) {
-        // 编辑
-        detailButtonEdit = [
-          defaultButtons.mainListEditBtn({
-            hide: isShowMainButton(row, ['1'])
-          })
-        ]
-      }
-      if (props.detailButtonIsShowDelete) {
-        // 删除
-        detailButtonDelete = [
-          defaultButtons.mainListDeleteBtn({
-            hide: isShowMainButton(row, ['1'])
-          })
-        ]
-      }
-      buttondata.value = [...detailButtonEdit,...detailButtonDelete,...props.buttondataTable]
-
-    } finally {
-      detailLoading.value = false
-    }
-  }
-}
-defineExpose({ openDetail, formRef }) // 提供 open 方法，用于打开弹窗
-
-// 获取备注列表
-const getRemarkList = async () => {
-  detailLoading.value = true
-  try {
-    remarksData.remarksList = await RemarkApi.getRemarkPage(remarksData.data)
-  } finally {
-    detailLoading.value = false
-  }
-}
-// 备注提交成功之后
-const remarksSubmitScuess = async (remark) => {
-  detailLoading.value = false
-  getRemarkList()
-  getChangeRecordList()
-}
-// 获取变更记录
-const getChangeRecordList = async () => {
-  changeRecordData.changeRecordList = await RemarkApi.getChangeRecordPage(remarksData.data)
-}
-
-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
-  // }
-  return false
-}
-
-// 获得表格的各种操作
-const { getList } = tableMethodsRef.value
-
-// 头部按钮事件
-const buttonBaseClick = (val, item) => {
-  if (val == 'add') {
-    // 新增
-    if(props.isOpenSearchTable){
-      searchTableFormType.value = 'create'
-      // 如果需要直接打开表格数据
-      searchTableFormModel.value = Object.assign(unref(searchTableFormModel), {
-        masterId: masterParmas.value.masterId,
-        code: masterParmas.value.code
-      })
-      const item = props.detailAllSchemas.formSchema[0]
-      opensearchTable(
-          item.field, item?.componentProps?.searchField,
-          item?.componentProps?.searchTitle, 
-          item?.componentProps?.searchAllSchemas, 
-          item?.componentProps?.searchPage,
-          item?.componentProps?.searchCondition,
-          item?.componentProps?.multiple,
-          undefined,undefined
-      )
-    }else{
-      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)
-  }
-}
-
-// 直接打开表格数据 --> 对应：isOpenSearchTable === true
-const opensearchTable = (
-  formField,
-  searchField,
-  searchTitle,
-  searchAllSchemas,
-  searchPage,
-  searchCondition,
-  multiple,
-  type,
-  row
-) => {
-  const _searchCondition = {}
-  // 判断查询条件中，是否存在指向主表的数据
-  if (searchCondition && searchCondition.length > 0) {
-    // 转换筛选条件所需
-    for (var i=0; i< searchCondition.length; i++ ) {
-      // 查询条件为主表某字段，需要赋值主表数据，数据来源是详情的，赋值需要从row中获取
-      if (searchCondition[i].isMainValue) {
-        _searchCondition[searchCondition[i].key] = detailData
-          ? detailData.value[searchCondition[i].value]
-          : ''
-      }else{
-        _searchCondition[searchCondition[i].key] = searchCondition[i].value
-      }
-    }
-  }
-  console.log(searchCondition)
-  console.log(_searchCondition)
-  searchTableRef.value.open(
-    searchTitle,
-    searchAllSchemas,
-    searchPage,
-    formField,
-    searchField,
-    multiple,
-    type,
-    row,
-    _searchCondition
-  )
-}
-
-// 字段设置 更新主列表字段
-// const updataTableColumns = (val) => {
-//   detailAllSchemas.tableColumns.value = val
-// }
-
-// 列表-操作按钮事件
-const buttonTableClick = async (val, row) => {
-  if (val == 'edit') {
-    // 编辑
-    if(props.isOpenSearchTable){
-      searchTableFormType.value = 'update'
-      if (row?.id || row?.masterId) {
-        searchTableFormModel.value = Object.assign(unref(searchTableFormModel), row)
-      }
-      const item = props.detailAllSchemas.formSchema[0]
-      opensearchTable(
-          item.field, item?.componentProps?.searchField,
-          item?.componentProps?.searchTitle, 
-          item?.componentProps?.searchAllSchemas, 
-          item?.componentProps?.searchPage,
-          item?.componentProps?.searchCondition,
-          item?.componentProps?.multiple,
-          undefined,undefined
-      )
-    }else{
-      openForm('update', row)
-    }
-  } else if (val == 'delete') {
-    // 删除
-    handleDelete(row.id)
-  } else {
-    emit('tableFormButton',val, row)
-  }
-}
-/** 添加/修改操作 */
-const openForm = async (type: string, row?: number) => {
-  formRef.value.open(type, row, masterParmas.value)
-  emit('detailOpenForm', type, row, masterParmas.value)
-}
-// form 提交
-const submitForm = async (formType, data) => {
-  try {
-    // 子表新增编辑校验 如果业务需要子表提交校验 需在主页详情组件添加 detailValidate 参数及方法
-    const rs = (await props.detailValidate) ? await props.detailValidate(formType,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 searchTableSuccess1 = (formField, searchField, val, formRef) => {
-  searchTableFormModel.value[formField] = val.map(item=>item[searchField]).join(',')
-  console.log('searchTableSuccess1',searchTableFormModel)
-  submitForm(searchTableFormType.value,searchTableFormModel.value)
-  emit('searchTableSuccessDetail', formField, searchField, val, formRef)
-}
-// 查询页面返回
-const searchTableSuccess = (formField, searchField, val, formRef) => {
-  emit('searchTableSuccessDetail', formField, searchField, val, formRef)
-}
-// 传递给父类
-const emit = defineEmits([
-  'searchTableSuccessDetail',
-  'changeTabs',
-  'selectChangeDetail',
-  'detailOpenForm',
-  'tableFormButton',
-  'openImage',
-  'onBlur',
-  'detailBasicFormOnChange',
-  'formFormDateChange'
-])
-/** 删除按钮操作 */
-const handleDelete = async (id: number) => {
-  try {
-    // 删除的二次确认
-    await message.delConfirm()
-    tableObject.loading = true
-    // 发起删除
-    await props.apiDelete(id)
-    tableObject.loading = false
-    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: 'masterId', action: '==', value: masterParmas.value.masterId }]
-  }
-  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)
-}
-/**
- * 监听改变事件
- * @param field 当前操作字段
- * @param cur 改变后值
- */
- const detailBasicFormOnChange = (field, cur) => {
-  emit('detailBasicFormOnChange', field, cur,formRef.value.formRef)
-}
-
-/**
- * 监听失焦事件
- * @param field 当前操作字段
- * @param e 
- */
- const onBlur = (field, e) => {
-  emit('onBlur', field, e)
-}
-
-// 日期改变事件
-const formFormDateChange = (field, val,row, index) => {
-  emit('formFormDateChange', field, val,row, index)
-}
-//监视属性
-watch(
-  () => props.apiPage,
-  () => {
-    const { tableObject, tableMethods } = useTable({
-      getListApi: props.apiPage // 分页接口
-    })
-    tableObject.params.masterId = masterParmas.value.masterId
-    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/views/qms/dynamicRule/index.vue b/src/views/qms/dynamicRule/index.vue
index c10632a51..5b92d1745 100644
--- a/src/views/qms/dynamicRule/index.vue
+++ b/src/views/qms/dynamicRule/index.vue
@@ -66,26 +66,22 @@
     :isSearchTableItem="true"
   />
 
+ 
   <!-- 详情 -->
-  <DetailQmsCode
-    ref="detailRef"
+  <Detail 
+    ref="detailRef" 
     :isBasic="false"
-    :allSchemas="DynamicRule.allSchemas"
-    :detailAllSchemas="InspectionStage.allSchemas"
+    :allSchemas="DynamicRule.allSchemas"  
+    :detailAllSchemas="InspectionStage.allSchemas" 
     :detailAllSchemasRules="InspectionStageRules"
-    :apiCreate="InspectionStageApi.createInspectionStage"
-    :apiUpdate="InspectionStageApi.updateInspectionStage"
     :apiPage="InspectionStageApi.getInspectionStagePage"
     :apiDelete="InspectionStageApi.deleteInspectionStage"
-    :detailValidate="detailValidate"
-    @searchTableSuccessDetail="searchTableSuccessDetail"
-    :detailButtonIsShowEdit="checkPermi(['qms:inspection-stage:update'])"
-    :detailButtonIsShowAdd="checkPermi(['qms:inspection-stage:create'])"
-    :detailButtonIsShowDelete="checkPermi(['qms:inspection-stage:delete'])"
-    @detailOpenForm="detailOpenForm"
-    myFuncTypeSign="InspectionStage"
+    :detailButtonIsShowAdd="true"
+    :detailButtonIsShowEdit="true"
+    :detailButtonIsShowDelete="true"
+    :detailButtonIsShowAddStatusArray="[]"
+    @handleSubmitForm='handleDetailSubmitForm'
   />
-
   <!-- 导入 -->
   <ImportForm
     ref="importFormRef"
@@ -112,7 +108,7 @@ import ImportForm from '../../../components/ImportForm/src/ImportForm.vue'
 import { formatDate } from '@/utils/formatTime'
 // 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/src/Detail.vue'
 import { usePageLoading } from '@/hooks/web/usePageLoading'
 const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'DynamicRule' })
@@ -273,8 +269,11 @@ const formsSuccess = async (formType, data) => {
 
 /** 详情操作 */
 const detailRef = ref()
-const openDetail = (row: any, titleName: any, titleValue: any) => {
+const openDetail =async (row: any, titleName: any, titleValue: any) => {
   detailMasterId.value = row.id
+  await InspectionStageApi.getInspectionStageNoPage({ masterId:row.id }).then((res) => {
+    detailList.value = res
+  })
   detailRef.value.openDetail(row, titleName, titleValue, 'basicDynamicRule')
 }
 
@@ -419,6 +418,7 @@ const validateIfRepeat = (type, data) => {
     detailList.value = detailList.value.filter((item) => item.id !== data.id)
     mergedArray = [data, ...detailList.value]
   }
+  console.log(mergedArray)
   const stageSet = new Set(mergedArray.map((item) => item.stage))
   return stageSet.size === mergedArray.length
 }
@@ -441,7 +441,26 @@ const validateNotRepetition = (data) => {
   }
   return true // 未发现重复，返回 true
 }
+const handleDetailSubmitForm = async (formType, data) => {
+  let mydata = { ...data }
+   const rs =  await detailValidate(formType,data)
+    if (!rs) return
+  console.log(data)
+  if (data.code) {
+    mydata.dynamicModifyCode = data.code
+  }
+  if (formType === 'create') {
+    await InspectionStageApi.createInspectionStage(data)
+    message.success(t('common.createSuccess'))
+      
+  } else {
+    await InspectionStageApi.updateInspectionStage(data)
+    message.success(t('common.updateSuccess'))
+  }
+  detailRef.value.submitUpdateList()
+  
 
+}
 /** 初始化 **/
 onMounted(async () => {
   tableObject.params = {
diff --git a/src/views/qms/inspectionRecord/index.vue b/src/views/qms/inspectionRecord/index.vue
index 9ac06b624..88c78d50f 100644
--- a/src/views/qms/inspectionRecord/index.vue
+++ b/src/views/qms/inspectionRecord/index.vue
@@ -223,7 +223,7 @@ const isShowEditBtn = (row, val) => {
   if (val.indexOf(row.inspectionType) > -1) {
     return true
   } else {
-    return row.useDecision
+    return row.isPublished
   }
 }
 const isShowPackageBtn = (row, val) => {
diff --git a/src/views/qms/inspectionRecord/inspectionRecordMain.data.ts b/src/views/qms/inspectionRecord/inspectionRecordMain.data.ts
index 9c106671b..b40337a96 100644
--- a/src/views/qms/inspectionRecord/inspectionRecordMain.data.ts
+++ b/src/views/qms/inspectionRecord/inspectionRecordMain.data.ts
@@ -603,7 +603,7 @@ export const InspectionRecordMain = useCrudSchemas(
       isForm: false,
       isDetail: false,
       table: {
-        width: 300,
+        width: 340,
         fixed: 'right'
       }
     }
diff --git a/src/views/qms/selectedProject/selectedProject.data.ts b/src/views/qms/selectedProject/selectedProject.data.ts
index cd273c428..3127a57f3 100644
--- a/src/views/qms/selectedProject/selectedProject.data.ts
+++ b/src/views/qms/selectedProject/selectedProject.data.ts
@@ -6,7 +6,7 @@ import * as DictTypeApi from '@/api/system/dict/dict.type'
 
 // 表单校验
 export const SelectedProjectRules = reactive({
-  code: [required],
+  // code: [required],
   // dictionaryTypeAndCode: [required],
   estimateCode: [required],
   defectLevel: [required],
diff --git a/src/views/qms/selectedSet/index.vue b/src/views/qms/selectedSet/index.vue
index 632e19234..e6d6c27e2 100644
--- a/src/views/qms/selectedSet/index.vue
+++ b/src/views/qms/selectedSet/index.vue
@@ -68,24 +68,19 @@
   />
 
   <!-- 详情 -->
-  <DetailQmsCode
-    ref="detailRef"
+  <Detail 
+    ref="detailRef" 
     :isBasic="false"
-    :allSchemas="SelectedSet.allSchemas"
-    :detailAllSchemas="SelectedProject.allSchemas"
+    :allSchemas="SelectedSet.allSchemas"  
+    :detailAllSchemas="SelectedProject.allSchemas" 
     :detailAllSchemasRules="SelectedProjectRules"
-    :apiCreate="SelectedProjectApi.createSelectedProject"
-    :apiUpdate="SelectedProjectApi.updateSelectedProject"
     :apiPage="SelectedProjectApi.getSelectedProjectPage"
     :apiDelete="SelectedProjectApi.deleteSelectedProject"
-    :detailValidate="detailValidate"
-    @searchTableSuccessDetail="searchTableSuccessDetail"
-    :detailButtonIsShowEdit="checkPermi(['qms:selected-project:update'])"
-    :detailButtonIsShowAdd="checkPermi(['qms:selected-project:create'])"
-    :detailButtonIsShowDelete="checkPermi(['qms:selected-project:delete'])"
-    @detailOpenForm="detailOpenForm"
-    @detailBasicFormOnChange="detailBasiFormOnChange"
-    :detailButtonIsShowFilter="false"
+    :detailButtonIsShowAdd="true"
+    :detailButtonIsShowEdit="true"
+    :detailButtonIsShowDelete="true"
+    :detailButtonIsShowAddStatusArray="[]"
+    @handleSubmitForm='handleDetailSubmitForm'
   />
 
   <!-- 导入 -->
@@ -279,6 +274,11 @@ const formsSuccess = async (formType, data) => {
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
   selectDictType.value = row.classification
+  SelectedProjectApi.getSelectedProjectNoPage(row.id).then((res) => {
+      if (res.length > 0) {
+        existValue.value = res
+      }
+    })
   detailRef.value.openDetail(row, titleName, titleValue, 'basicSelectedSet')
 }
 
@@ -448,9 +448,26 @@ const detailOpenForm = (type, row, masterParmas) => {
   }
 }
 
-const detailBasiFormOnChange = (field, val, detailFormRef) => {}
+const handleDetailSubmitForm = async (formType, data) => {
+  let mydata = { ...data }
+   const rs =  await detailValidate(formType,data)
+    if (!rs) return
+  console.log(data)
+  if (data.code) {
+    mydata.dynamicModifyCode = data.code
+  }
+  if (formType === 'create') {
+    await SelectedProjectApi.createSelectedProject(data)
+    message.success(t('common.createSuccess'))
+      
+  } else {
+    await SelectedProjectApi.updateSelectedProject(data)
+    message.success(t('common.updateSuccess'))
+  }
+  detailRef.value.submitUpdateList()
+  
 
-const formSelectChange = (a, b, c, d) => {}
+}
 
 /** 初始化 **/
 onMounted(async () => {
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue
index e6ee9865e..76c190d5d 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue
@@ -1153,7 +1153,7 @@ defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
 const submitForm = async () => {
   await blurWarehouse()
-  await blurTransactionType()
+  // await blurTransactionType()
   if(warehouseType.value == 'WarehouseCode' && !formData.value.configuration.WarehouseCode){
     // 仓库
     message.error('请选择仓库')
diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts
index 74fedc839..c1d6e643e 100644
--- a/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts
+++ b/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts
@@ -353,7 +353,7 @@ export const DeliverRecordMain = useCrudSchemas(
       table: {
         width: 180
       },
-      isTable: true,
+      isTable: false,
       form: {
         component: 'DatePicker',
         componentProps: {
@@ -362,7 +362,7 @@ export const DeliverRecordMain = useCrudSchemas(
           valueFormat: 'x'
         }
       },
-      isSearch: true,
+      isSearch: false,
       search: {
         component: 'DatePicker',
         componentProps: {
@@ -379,7 +379,7 @@ export const DeliverRecordMain = useCrudSchemas(
       table: {
         width: 150
       },
-      isTable: true
+      isTable: false
     },
     // {
     //   label: '代码',
@@ -757,15 +757,24 @@ export const DeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
-    isTable: false,
+    isTable: true,
     form: {
       component: 'DatePicker',
       componentProps: {
         type: 'datetime',
         dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+        valueFormat: 'x'
       }
     },
+    isSearch: true,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      },
+    },
   },
   {
     label: '创建者',
@@ -774,7 +783,7 @@ export const DeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    isTable: false,
+    isTable: true,
   },
   // {
   //   label: '任务明细ID',
diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts
index 11eb1d0c1..9b36f3867 100644
--- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts
+++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts
@@ -98,6 +98,11 @@ export const DeliverRequestMain = useCrudSchemas(
               key: 'available',
               value: 'TRUE',
               isMainValue: false
+            },
+            {
+              key: 'type',
+              value: 'DEFAULT',
+              isMainValue: false
             }
           ],
           verificationParams: [
diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/unplannedissueJobMain.data.ts b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/unplannedissueJobMain.data.ts
index 5482ed0b7..5aeef622f 100644
--- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/unplannedissueJobMain.data.ts
+++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/unplannedissueJobMain.data.ts
@@ -60,6 +60,9 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '领用描述',
     field: 'usageDescription',
     sort: 'custom',
+    isTableForm:false,
+    isForm: false,
+    isTable:false,
     table: {
       width: 150
     },
@@ -869,22 +872,22 @@ export const UnplannedissueJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
-  {
-    label: '成本中心代码',
-    field: 'costcentreCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '科目代码',
-    field: 'qadProjectCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
+  // {
+  //   label: '成本中心代码',
+  //   field: 'costcentreCode',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  // {
+  //   label: '科目代码',
+  //   field: 'qadProjectCode',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
   {
     label: '货主代码',
     field: 'ownerCode',
diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts
index d1100c8fa..f40ba7322 100644
--- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts
+++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts
@@ -304,14 +304,14 @@ export const UnplannedissueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
-  {
-    label: '从月台代码',
-    field: 'fromDockCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
+  // {
+  //   label: '从月台代码',
+  //   field: 'fromDockCode',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
   {
     label: '领用代码',
     field: 'usageCode',
@@ -338,14 +338,14 @@ export const UnplannedissueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
-  {
-    label: '入库事务类型',
-    field: 'inTransactionType',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
+  // {
+  //   label: '入库事务类型',
+  //   field: 'inTransactionType',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
   {
     label: '业务类型',
     field: 'businessType',
diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts
index 143586bf0..456d30ca6 100644
--- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts
@@ -307,6 +307,10 @@ export const UnplannedissueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '领用原因描述',
     field: 'reasonDescRequisition',
     sort: 'custom',
+    isTableForm:false,
+    isForm: true,
+    isTable:false,
+    isDetail:false,
     table: {
       width: 150
     },
diff --git a/src/views/wms/productionManage/productreceipt/productreceiptJobMain/productreceiptJobMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptJobMain/productreceiptJobMain.data.ts
index 45a93e713..200841c0a 100644
--- a/src/views/wms/productionManage/productreceipt/productreceiptJobMain/productreceiptJobMain.data.ts
+++ b/src/views/wms/productionManage/productreceipt/productreceiptJobMain/productreceiptJobMain.data.ts
@@ -1,5 +1,7 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+import * as ShiftApi from '@/api/wms/shift'
+const shiftList = await ShiftApi.getShiftPage({available:'TRUE',pageSize: 500,pageNo: 1,sort:'',by: 'ASC'})
 
 /**
  * @returns {Array} 制品收货任务主表
@@ -73,6 +75,15 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
+  {
+    label: '班组',
+    field: 'teamName',
+    sort: 'custom',
+    isTable:true,
+    table: {
+      width: 150
+    },
+  },
   {
     label: '班次',
     field: 'shift',
@@ -82,6 +93,26 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
+  {
+    label: '班次',
+    field: 'shiftName',
+    sort: 'custom',
+    isTable:true,
+    table: {
+      width: 150
+    },
+    isSearch: true,
+    search: {
+      component:'Select',
+      componentProps:{
+          options:shiftList.list,
+          optionsAlias: {
+            labelField: 'name',
+            valueField: 'name'
+          },
+      }
+    }
+  },
   {
     label: '收货类型',
     field: 'type',
diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts
index a280d25da..c6791cdac 100644
--- a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts
+++ b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts
@@ -1,5 +1,7 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+import * as ShiftApi from '@/api/wms/shift'
+const shiftList = await ShiftApi.getShiftPage({available:'TRUE',pageSize: 500,pageNo: 1,sort:'',by: 'ASC'})
 
 /**
  * @returns {Array} 制品收货记录主表
@@ -69,6 +71,15 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isTable: false
   },
+  {
+    label: '班组',
+    field: 'teamName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: true
+  },
   {
     label: '班次',
     field: 'shift',
@@ -78,6 +89,26 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isTable: false
   },
+  {
+    label: '班次',
+    field: 'shiftName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: true,
+    isSearch: true,
+    search: {
+      component:'Select',
+      componentProps:{
+          options:shiftList.list,
+          optionsAlias: {
+            labelField: 'name',
+            valueField: 'name'
+          },
+      }
+    }
+  },
   {
     label: '收货类型',
     field: 'type',
diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts
index 122cf480e..85e460036 100644
--- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts
+++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts
@@ -262,31 +262,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
           }], // 失去焦点校验参数
       }
     }
-    // form: {
-    //   // labelMessage: '信息提示说明！！！',
-    //   componentProps: {
-    //     enterSearch: true,
-    //     isSearchList: true,
-    //     searchListPlaceholder: '请选择班次',
-    //     searchField: 'code',
-    //     searchTitle: '班次信息',
-    //     searchAllSchemas: Shift.allSchemas,
-    //     searchPage: ShiftApi.getShiftPage,
-    //     searchCondition: [{
-    //       key: 'available',
-    //       value: 'TRUE',
-    //       isMainValue: false
-    //     }],
-    //     verificationParams: [{
-    //       key: 'code',
-    //       action: '==',
-    //       value: '',
-    //       isMainValue: false,
-    //       isSearch: true,
-    //       isFormModel: true,
-    //     }], // 失去焦点校验参数
-    //   }
-    // }
+    
   },
   {
     label: '班次',
@@ -296,7 +272,19 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     isForm:false,
-    sortTableDefault: 1001
+    sortTableDefault: 1001,
+    isSearch: true,
+    search: {
+      component:'Select',
+      componentProps:{
+          options:shiftList.list,
+          optionsAlias: {
+            labelField: 'name',
+            valueField: 'name'
+          },
+      }
+    }
+    
   },
   {
     label: '收货类型',
diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/productreceiptAssembleJobMain.data.ts b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/productreceiptAssembleJobMain.data.ts
index 029ec1ca1..bed0e1d08 100644
--- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/productreceiptAssembleJobMain.data.ts
+++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/productreceiptAssembleJobMain.data.ts
@@ -1,6 +1,8 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
-
+import * as ShiftApi from '@/api/wms/shift'
+const shiftList = await ShiftApi.getShiftPage({available:'TRUE',pageSize: 500,pageNo: 1,sort:'',by: 'ASC'})
+console.log('shiftList',shiftList)
 /**
  * @returns {Array} 制品收货任务主表
  */
@@ -73,6 +75,15 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
+  {
+    label: '班组',
+    field: 'teamName',
+    sort: 'custom',
+    isTable:true,
+    table: {
+      width: 150
+    },
+  },
   {
     label: '班次',
     field: 'shift',
@@ -82,6 +93,26 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
+  {
+    label: '班次',
+    field: 'shiftName',
+    sort: 'custom',
+    isTable:true,
+    isSearch:true,
+    table: {
+      width: 150
+    },
+    search: {
+      component:'Select',
+      componentProps:{
+          options:shiftList.list,
+          optionsAlias: {
+            labelField: 'name',
+            valueField: 'name'
+          },
+      }
+    }
+  },
   {
     label: '收货类型',
     field: 'type',
diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/productreceiptAssembleRecordMain.data.ts b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/productreceiptAssembleRecordMain.data.ts
index e697dda38..e3b004cc2 100644
--- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/productreceiptAssembleRecordMain.data.ts
+++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/productreceiptAssembleRecordMain.data.ts
@@ -1,5 +1,7 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+import * as ShiftApi from '@/api/wms/shift'
+const shiftList = await ShiftApi.getShiftPage({available:'TRUE',pageSize: 500,pageNo: 1,sort:'',by: 'ASC'})
 
 /**
  * @returns {Array} 制品收货记录主表
@@ -88,6 +90,16 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isTable: false,
 
+  },
+  {
+    label: '班组',
+    field: 'teamName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: true,
+
   },
   {
     label: '班次',
@@ -98,6 +110,26 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isTable: false,
   },
+  {
+    label: '班次',
+    field: 'shiftName',
+    sort: 'custom',
+    isSearch:true,
+    isTable:true,
+    table: {
+      width: 150
+    },
+    search: {
+      component:'Select',
+      componentProps:{
+          options:shiftList.list,
+          optionsAlias: {
+            labelField: 'name',
+            valueField: 'name'
+          },
+      }
+    }
+  },
   {
     label: '收货类型',
     field: 'type',
diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts
index 643d79520..2c1becb57 100644
--- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts
+++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts
@@ -271,31 +271,6 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
           }], // 失去焦点校验参数
       }
     }
-    // form: {
-    //   // labelMessage: '信息提示说明！！！',
-    //   componentProps: {
-    //     enterSearch: true,
-    //     isSearchList: true,
-    //     searchListPlaceholder: '请选择班次',
-    //     searchField: 'code',
-    //     searchTitle: '班次信息',
-    //     searchAllSchemas: Shift.allSchemas,
-    //     searchPage: ShiftApi.getShiftPage,
-    //     searchCondition: [{
-    //       key: 'available',
-    //       value: 'TRUE',
-    //       isMainValue: false
-    //     }],
-    //     verificationParams: [{
-    //       key: 'code',
-    //       action: '==',
-    //       value: '',
-    //       isMainValue: false,
-    //       isSearch: true,
-    //       isFormModel: true,
-    //     }], // 失去焦点校验参数
-    //   }
-    // }
   },
   {
     label: '班次',
@@ -304,8 +279,19 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isSearch:true,
     isForm:false,
-    sortTableDefault: 1001
+    sortTableDefault: 1001,
+    search: {
+      component:'Select',
+      componentProps:{
+          options:shiftList.list,
+          optionsAlias: {
+            labelField: 'name',
+            valueField: 'name'
+          },
+      }
+    }
   },
   {
     label: '收货类型',