diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue
index 01f94218b..4d039ba7b 100644
--- a/src/components/BasicForm/src/BasicForm.vue
+++ b/src/components/BasicForm/src/BasicForm.vue
@@ -1,5 +1,10 @@
 <template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible" :width="isBusiness ? '60%' : '40%'" :close-on-click-modal="false">
+  <Dialog
+    :title="dialogTitle"
+    v-model="dialogVisible"
+    :width="isBusiness ? '60%' : '40%'"
+    :close-on-click-modal="false"
+  >
     <Form
       ref="formRef"
       v-loading="formLoading"
@@ -12,7 +17,11 @@
         <crontab v-model="formSchema.crontab" />
       </template>
       <template #type="formSchema" v-if="fromeWhere == 'countPlan'">
-        <el-select v-model="formSchema.type" placeholder="选择盘点类型" @change="selectChange('type',$event)">
+        <el-select
+          v-model="formSchema.type"
+          placeholder="选择盘点类型"
+          @change="selectChange('type', $event)"
+        >
           <el-option
             v-for="dict in getStrDictOptions(DICT_TYPE.COUNT_TYPE)"
             :key="dict.value"
@@ -22,7 +31,7 @@
         </el-select>
       </template>
     </Form>
-    <div class="table" v-if="isBusiness && formType == 'create'">
+    <div class="table" v-if="isBusiness && formType == 'create' && fromeWhere != 'countPlan'">
       <TableForm
         ref="tableFormRef"
         class="w-[100%]"
@@ -35,13 +44,24 @@
         @tableSelectionChange="tableSelectionChange"
         @extendedButtonsClick="extendedButtonsClick"
         @formSelectChange="formSelectChange"
-        @formSelectvVisibleChange = 'formSelectvVisibleChange'
+        @formSelectvVisibleChange="formSelectvVisibleChange"
         @tableSortChange="tableSortChange"
         @selectCallback="selectCallback"
         @handleTableSelect="handleTableSelect"
         @inpuFocus="inpuFocus"
       />
     </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"
+      />
+    </div>
     <template #footer>
       <ButtonBase :Butttondata="Butttondata" @button-base-click="buttonBaseClick" />
     </template>
@@ -53,6 +73,7 @@ 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({
@@ -143,6 +164,11 @@ const props = defineProps({
     type: String,
     required: false,
     default: ''
+  },
+  countScopeType: {
+    type: Array,
+    required: false,
+    default: null
   }
 })
 
@@ -156,7 +182,9 @@ const formType = ref('') // 表单的类型：create - 新增；update - 修改
 
 const formRef = ref() // 表单 Ref
 const formSchema = ref(props.formAllSchemas?.formSchema)
-console.log('props.formAllSchemas',props.formAllSchemas)
+const tableAllSchemas = ref(props.tableAllSchemas)
+const tableFormRules = ref(props.tableFormRules)
+console.log('tableAllSchemas', tableAllSchemas.value)
 
 /** 弹层操作 */
 // formField form表单中的字段
@@ -179,7 +207,7 @@ const opensearchTable = (
   // 判断查询条件中，是否存在指向主表的数据
   if (searchCondition && searchCondition.length > 0) {
     // 转换筛选条件所需
-    let filters:any[] = []
+    let filters: any[] = []
     searchCondition.forEach((item) => {
       // 查询条件为主表某字段，需要赋值主表数据，数据来源是详情的，赋值需要从row中获取
       // 20231127 row[item.value]?row[item.value] 修改为 row?row[item.value] 返回'null' 为了查询不到任何数据
@@ -348,14 +376,15 @@ const emit = defineEmits([
   'searchTableSuccess',
   'opensearchTable',
   'submitForm',
-  'selectChange'
+  'selectChange',
+  'tableFormChange'
 ])
 //普通下拉改变事件
-const formSelectChange = (field, val,row) => {
-  emit('formSelectChange', field, val,row)
+const formSelectChange = (field, val, row) => {
+  emit('formSelectChange', field, val, row)
 }
-const formSelectvVisibleChange = (field, val,row) => {
-  emit('formSelectvVisibleChange', field, val,row)
+const formSelectvVisibleChange = (field, val, row) => {
+  emit('formSelectvVisibleChange', field, val, row)
 }
 // 点击selection框
 const tableSelectionChange = (val) => {
@@ -385,8 +414,6 @@ const handleAddTable = () => {
 }
 // 输入框聚焦
 const inpuFocus = (headerItem, row, index) => {
-  console.log(headerItem.tableForm.multiple)
-
   opensearchTable(
     headerItem.field,
     headerItem.tableForm.searchField,
@@ -399,16 +426,56 @@ const inpuFocus = (headerItem, row, index) => {
     row
   )
 }
+
 // 修改盘点类型
-const selectChange=((field,val)=>{
-emit('selectChange',field,val)
-})
+const selectChange = (field, val) => {
+  emit('selectChange', field, val)
+}
+
+const tableFormChange = (field, val, row) => {
+  emit('tableFormChange', field, val, row)
+}
 </script>
 <style lang="scss" scoped>
 .table {
   border: 1px solid #dedede;
   border-radius: 8px;
   padding: 10px;
+  width: calc(100% - 20px);
   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 a221dd247..0eddf4f7d 100644
--- a/src/components/Detail/src/Detail.vue
+++ b/src/components/Detail/src/Detail.vue
@@ -46,7 +46,7 @@
             :columns="2"
           />
           <Table
-            v-if="!isBasic"
+            v-if="!isBasic && fromeWhere != 'countPlan'"
             :columns="detailAllSchemasRef.tableColumns"
             :data="tableObjectRef.tableList"
             :loading="tableObjectRef.loading"
@@ -61,6 +61,7 @@
               />
             </template>
           </Table>
+
         </ContentWrap>
         <ContentWrap class="w-[27%] ml-16px">
           <!-- 附件组件 -->
@@ -180,7 +181,13 @@ const props = defineProps({
     type: Function,
     required: false,
     default: null
-  }
+  },
+  // 来源 countPlan盘点计划进入
+  fromeWhere: {
+    type: String,
+    required: false,
+    default: ''
+  },
 })
 const isShowDrawer = ref(false)
 const detailLoading = ref(false)
diff --git a/src/components/DetailCountPlan/index.ts b/src/components/DetailCountPlan/index.ts
new file mode 100644
index 000000000..2acd32a21
--- /dev/null
+++ b/src/components/DetailCountPlan/index.ts
@@ -0,0 +1,3 @@
+import DetailCountPlan from './src/DetailCountPlan.vue'
+
+export { DetailCountPlan }
diff --git a/src/components/DetailCountPlan/src/DetailCountPlan.vue b/src/components/DetailCountPlan/src/DetailCountPlan.vue
new file mode 100644
index 000000000..80a59f6e2
--- /dev/null
+++ b/src/components/DetailCountPlan/src/DetailCountPlan.vue
@@ -0,0 +1,499 @@
+<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 :tabsList="tabsList" :current="current" @change="change" />
+      <div class="flex">
+        <!-- 详情 -->
+        <ContentWrap class="w-[73%]">
+          <!-- 列表头部 -->
+          <TableHead
+            v-if="!isBasic"
+            :HeadButttondata="HeadButttondata"
+            :masterId="masterParmas.masterId"
+            @button-base-click="buttonBaseClick"
+            :routeName="routeName"
+            @searchFormClick="searchFormClick"
+            :allSchemas="detailAllSchemas"
+          />
+          <Descriptions
+            v-if="isBasic"
+            :data="detailData"
+            :schema="allSchemas.detailSchema"
+            :columns="2"
+          />
+          <Table
+            v-if="!isBasic"
+            :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>
+        </ContentWrap>
+        <ContentWrap class="w-[27%] ml-16px">
+          <!-- 附件组件 -->
+          <Annex
+            :annexData="annexData"
+            @handleAnnexSuccess="handleAnnexSuccess"
+            @deleteAnnexSuccess="deleteAnnexSuccess"
+            :upData="remarksData.data"
+          />
+          <!-- 备注组件 -->
+          <Remarks
+            :remarksData="remarksData"
+            class="mt-20px"
+            @remarksSubmitScuess="remarksSubmitScuess"
+          />
+          <!-- 变更记录组件 -->
+          <ChangeRecord :changeRecordData="changeRecordData" class="mt-20px" />
+        </ContentWrap>
+      </div>
+    </el-drawer>
+    <!-- 表单弹窗：添加/修改 -->
+    <BasicForm
+      ref="formRef"
+      @success="submitForm"
+      :rules="detailAllSchemasRules"
+      :formAllSchemas="detailAllSchemas"
+      :isBusiness="false"
+      :apiUpdate="apiUpdate"
+      :apiCreate="apiCreate"
+      @searchTableSuccess="searchTableSuccess"
+      :detailData="detailData"
+      @submitForm="submitForm"
+    />
+  </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'
+
+defineOptions({ name: 'DetailCountPlan' })
+
+
+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 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
+  }
+})
+const isShowDrawer = ref(false)
+const detailLoading = ref(false)
+const tabsList = ref(JSON.parse(JSON.stringify(props.tabs ? props.tabs : '')))
+
+if (props.isBasic == true) {
+  if (tabsList.value && tabsList.value.length > 0) {
+    tabsList.value.unshift({
+      label: '详情',
+      prop: 'Detail'
+    })
+  }
+} else {
+  if (tabsList.value && tabsList.value.length > 0) {
+  } else {
+    tabsList.value = [
+      {
+        label: '明细',
+        prop: 'Detail'
+      }
+    ]
+  }
+}
+if (tabsList.value) {
+}
+
+// 附件默认数据
+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)
+}
+
+//主表所需的参数
+const masterParmas = ref({
+  masterId: '', //主表id
+  number: '', //主表单据号
+  status: '' //主表状态 用于控制子表新增编辑按钮显示情况
+})
+
+// 列表头部按钮
+const HeadButttondata = ref()
+// 列表-操作按钮
+const buttondata = ref()
+
+/** 打开弹窗 */
+const titleNameRef = ref()
+const titleValueRef = ref()
+const openDetail = async (row: any, titleName: any, titleValue: any, tableName: any) => {
+  titleNameRef.value = titleName
+  titleValueRef.value = titleValue
+  remarksData.data = {
+    tableId: row.id,
+    tableName: tableName
+  }
+  // 加载明细列表
+  if (!props.isBasic) {
+    // 设置主表id
+    masterParmas.value.masterId = row.id
+    masterParmas.value.number = row.number
+    masterParmas.value.status = row.status
+    tableObjectRef.value.params = {
+      masterId: row.id
+    }
+    getList()
+  }
+  isShowDrawer.value = true
+  if (row) {
+    detailLoading.value = true
+    try {
+      detailData.value = row
+      getRemarkList()
+      getFileList()
+      getChangeRecordList()
+      // 判断详情新增按钮是否显示
+      if(routeName.value.indexOf('Job') > -1){
+        HeadButttondata.value = [
+          defaultButtons.defaultFilterBtn(null) // 筛选
+        ]
+      }else{
+        HeadButttondata.value = [
+          defaultButtons.defaultAddBtn({
+            hide: isShowMainButton(row, ['1'])
+          }), // 新增
+          defaultButtons.defaultFilterBtn(null) // 筛选
+        ]
+      }
+      // 动态显示操作列按钮
+      buttondata.value = [
+        defaultButtons.mainListEditBtn({
+          hide: isShowMainButton(row, ['1'])
+        }), // 编辑
+        defaultButtons.mainListDeleteBtn({
+          hide: isShowMainButton(row, ['1'])
+        }) // 删除
+      ]
+    } finally {
+      detailLoading.value = false
+    }
+  }
+}
+defineExpose({ openDetail }) // 提供 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
+  }
+}
+
+// 获得表格的各种操作
+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)
+  } else if (val == 'delete') {
+    // 删除
+    handleDelete(row.id)
+  }
+}
+/** 添加/修改操作 */
+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
+    // 刷新当前列表
+    getList()
+  } finally {
+    formRef.value.formLoading = false
+  }
+}
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef) => {
+  emit('searchTableSuccessDetail', formField, searchField, val, formRef)
+}
+// 传递给父类
+const emit = defineEmits(['searchTableSuccessDetail', 'changeTabs'])
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await props.apiDelete(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+// 筛选提交
+const searchFormClick = (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
+    getList()
+  // tableObjectRef.value.params = {
+  //   isSearch: true,
+  //   filters: searchData.filters
+  //     ? searchData.filters
+  //     : [{ column: 'masterId', action: '==', value: masterParmas.value.masterId }]
+  // }
+  // getList() // 刷新当前列表
+}
+
+//监视属性
+watch(
+  () =>props.apiPage,
+  () => {
+    const { tableObject, tableMethods } = useTable({
+      getListApi: props.apiPage // 分页接口
+    })
+    tableObject.params.masterId = masterParmas.value.masterId
+    detailAllSchemasRef.value = props.detailAllSchemas
+    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/TableForm/src/TableForm.vue b/src/components/TableForm/src/TableForm.vue
index 527d2ad9e..2fbdd83eb 100644
--- a/src/components/TableForm/src/TableForm.vue
+++ b/src/components/TableForm/src/TableForm.vue
@@ -112,8 +112,7 @@
               :allow-create="headerItem?.tableForm.allowCreate"
               style="width: 100%" 
               :placeholder="headerItem?.tableForm?.placeholder || '请选择' + headerItem.label"
-              @change="formSelectChange(headerItem.field, $event,row)"
-              @visible-change="formSelectvVisibleChange(headerItem.field, $event,row)">
+              @change="formSelectChange(headerItem.field, $event,row)">
               <el-option 
                 v-for="op in initSelectOptions(headerItem)" 
                 :label="op.label" 
@@ -326,7 +325,6 @@ const emit = defineEmits([
   'tableSelectionChange',
   'extendedButtonsClick',
   'formSelectChange',
-  'formSelectvVisibleChange',
   'tableSortChange',
   'selectCallback',
   'handleTableSelect',
@@ -342,9 +340,7 @@ const initSelectOptions = (item) => {
 const formSelectChange = (field, val,row) => {
   emit('formSelectChange', field, val,row)
 }
-const formSelectvVisibleChange = (field, val,row) => {
-  emit('formSelectvVisibleChange', field, val,row)
-}
+
 // 点击selection框
 const tableSelectionChange = (val) => {
   emit('tableSelectionChange', val)
@@ -381,6 +377,7 @@ const TableBaseForm_Ref = ref()
    */
 
 const validateForm = () => {
+  console.log(TableBaseForm_Ref.value)
   let _lists = TableBaseForm_Ref.value?.map(v => v.validate())
   return Promise.all(_lists).then(() => {
     return true
diff --git a/src/components/TableFormCountPlan/index.ts b/src/components/TableFormCountPlan/index.ts
new file mode 100644
index 000000000..2f51d1abc
--- /dev/null
+++ b/src/components/TableFormCountPlan/index.ts
@@ -0,0 +1,3 @@
+import TableFormCountPlan from './src/TableFormCountPlan.vue'
+
+export { TableFormCountPlan }
diff --git a/src/components/TableFormCountPlan/src/TableFormCountPlan.vue b/src/components/TableFormCountPlan/src/TableFormCountPlan.vue
new file mode 100644
index 000000000..12bc0bf5a
--- /dev/null
+++ b/src/components/TableFormCountPlan/src/TableFormCountPlan.vue
@@ -0,0 +1,193 @@
+<!-- 附件组件 -->
+<template>
+  <!-- 盘点计划的子表 -->
+  <div class="table">
+    <el-table :data="tableData" stripe style="width: 100%"
+      ref="TableBaseComponents_Ref" >
+      <el-table-column fixed="left" :width="50" v-slot="{ row, $index }">
+        <Icon
+          icon="ep:remove"
+          color="#757575"
+          size="26"
+          style="cursor: pointer;margin-top: -16px;"
+          @click="handleDeleteTable(row, $index)"
+        />
+      </el-table-column>
+      <el-table-column  :label="tableFields[0].label" align="center">
+        <template v-slot="{ row }">
+          <el-form 
+          ref="TableBaseForm_Ref" 
+          :model="row" 
+          style="width: 100%;" 
+          :rules="tableFormRules"
+          :class="tableFormRules ? '' : 'noRulesForm'">
+          <el-form-item :prop="tableFields[0].field">
+          <el-select
+            v-model="row.type"
+            :placeholder="tableFields[0].placeholder || '请输入' + tableFields[0].label"
+            @change="tableFormChange(tableFields[0].field, $event, row)"
+          >
+            <el-option
+              v-for="dict in countScopeType"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+          </el-form-item>
+          </el-form>
+        </template>
+      </el-table-column>
+      <el-table-column
+        :prop="tableFields[1].field"
+        :label="tableFields[1].label"
+        align="center"
+      >
+        <template v-slot="{ row }">
+          <el-form 
+          ref="TableBaseForm_Ref1" 
+          :model="row" 
+          style="width: 100%;" 
+          :rules="tableFormRules"
+          :class="tableFormRules ? '' : 'noRulesForm'">
+          <el-form-item :prop="tableFields[1].field">
+          <el-select
+            v-model="row.value"
+            :placeholder="
+              tableFields[1].placeholder ||
+              '请输入' + tableFields[1].label
+            "
+            v-if="
+              row.type == 'OWNER' ||
+              row.type == 'SUPPLIER' ||
+              row.type == 'CUSTOMER' ||
+              row.type == 'ABC' ||
+              row.type == 'ITEMS_TYPE' ||
+              row.type == 'ITEMS_GROUP' ||
+              row.type == 'ITEMS_CODE' ||
+              row.type == 'WAREHOUSE_CODE' ||
+              row.type == 'AREABASIC_CODE' ||
+              row.type == 'LOCATIONGROUP_CODE' ||
+              row.type == 'LOCATION_CODE'
+            "
+          >
+            <el-option
+              v-for="item in row.initOptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+          <el-input
+            v-model="row.value"
+            :placeholder="
+              tableFields[1].placeholder ||
+              '请输入' + tableFields[1].label
+            "
+            v-else
+          />
+          </el-form-item>
+          </el-form>
+        </template>
+      </el-table-column>
+    </el-table>
+    <div class="button flex">
+      <div class="p-12px" @click="handleAddTable">
+        <Icon icon="ep:circle-plus" color="#409eff" size="26" style="cursor: pointer" />
+        <div>添加明细</div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup>
+defineComponent({
+  name: 'TableFormCountPlan'
+})
+const props = defineProps({
+  // 列表头定义
+  tableFields: {
+    type: Array,
+    default: () => {
+      return []
+    }
+  },
+  // 列表数据
+  tableData: {
+    type: Array,
+    default: () => {
+      return []
+    }
+  },
+  tableFormRules: {
+    type: Array,
+    required: true,
+    default: null
+  },
+  countScopeType: {
+    type: Array,
+    required: false,
+    default: null
+  },
+})
+const tableData = props.tableData
+const tableFields = props.tableFields
+const TableBaseComponents_Ref = ref()
+const TableBaseForm_Ref = ref()
+const TableBaseForm_Ref1 = ref()
+const tableFormRules = ref(props.tableFormRules)
+console.log('tableFormRules',tableFormRules.value)
+/**
+   * 验证表单是否符合rules
+   * @param {*} success 如果验证【成功】走的方法
+   * @param {*} error 如果验证【不成功】走的方法
+   */
+
+   const validateForm = () => {
+    let TableBaseForm_Arr = []
+    TableBaseForm_Arr.push(TableBaseForm_Ref.value)
+    TableBaseForm_Arr.push(TableBaseForm_Ref1.value)
+  let _lists = TableBaseForm_Arr?.map(v => v.validate())
+  return Promise.all(_lists).then(() => {
+    return true
+  }).catch(() => {
+    return false
+  })
+}
+// 传递给父类
+const emit = defineEmits(['handleAddTable', 'selectChange', 'tableFormChange'])
+// 修改盘点类型
+const selectChange = (field, val) => {
+  emit('selectChange', field, val)
+}
+
+const tableFormChange = (field, val, row) => {
+  emit('tableFormChange', field, val, row)
+}
+// 添加数据
+const handleAddTable = () => {
+  emit('handleAddTable')
+}
+// setup 语法糖 抛出方法
+defineExpose({
+  TableBaseComponents_Ref,
+  validateForm
+})
+
+</script>
+<style scoped lang="scss">
+.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/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts b/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts
index 92dd2e5d5..22be31675 100644
--- a/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts
+++ b/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts
@@ -648,7 +648,6 @@ export const CountPlanDetail = useCrudSchemas(<CrudSchema[]>([
       width: 300
     },
     tableForm: {
-      type: 'InputString',
       width: '300',
     }
   },
@@ -665,19 +664,10 @@ export const CountPlanDetail = useCrudSchemas(<CrudSchema[]>([
   }
 ]))
 export const CountPlanDetailRules = reactive({
-  available: [
-    { required: true, message: '请选择是否可用', trigger: 'change' }
-  ],
-  uom: [
-    { required: true, message: '请选择计量单位', trigger: 'change' }
-  ],
-  planQty: [
-    { required: true, message: '请输入计划数量', trigger: 'blur' }
-  ],
-  number: [
-    { required: true, message: '请输入单据号', trigger: 'blur' }
+  type: [
+    { required: true, message: '请选择盘点范围类型', trigger: 'change' }
   ],
-  itemCode: [
-    { required: true, message: '请选择物品代码', trigger: 'change' }
+  value: [
+    { required: true, message: '请选择盘点范围值', trigger: 'change' }
   ],
 })
\ No newline at end of file
diff --git a/src/views/wms/countManage/count/countPlanMain/index.vue b/src/views/wms/countManage/count/countPlanMain/index.vue
index ab9350ad8..c5363524f 100644
--- a/src/views/wms/countManage/count/countPlanMain/index.vue
+++ b/src/views/wms/countManage/count/countPlanMain/index.vue
@@ -57,6 +57,7 @@
     :apiUpdate="CountPlanMainApi.updateCountPlanMain"
     :apiCreate="CountPlanMainApi.createCountPlanMain"
     fromeWhere="countPlan"
+    :countScopeType="getStrDictOptions(DICT_TYPE.COUNT_SCOPE_TYPE)"
     @handleAddTable="handleAddTable"
     @handleDeleteTable="handleDeleteTable"
     @searchTableSuccess="searchTableSuccess"
@@ -64,6 +65,7 @@
     @formSelectChange="formSelectChange"
     @formSelectvVisibleChange="formSelectvVisibleChange"
     @selectChange="selectChange"
+    @tableFormChange="tableFormChange"
   />
 
   <!-- 详情 -->
@@ -79,6 +81,7 @@
     :apiPage="CountPlanDetailApi.getCountPlanDetailPage"
     :apiDelete="CountPlanDetailApi.deleteCountPlanDetail"
     :Echo="Echo"
+    fromeWhere="countPlan"
   />
 
   <!-- 导入 -->
@@ -112,6 +115,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import * as ItembasicApi from '@/api/wms/itembasic'
 import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data'
 import { DICT_TYPE, getIntDictOptions, getStrDictOptions } from '@/utils/dict'
+console.log('CountPlanDetail.allSchemas', CountPlanDetail.allSchemas)
 
 // 盘点计划主
 defineOptions({ name: 'CountPlanMain' })
@@ -290,7 +294,10 @@ const buttonTableClick = async (val, row) => {
 /** 添加/修改操作 */
 const formRef = ref()
 const openForm = async (type: string, row?: number) => {
-  tableData.value = [] // 重置明细数据
+  tableData.value = [ {
+    type: '',
+    value: ''
+  }] // 重置明细数据
   formRef.value.open(type, row)
 
   getOwnerAllList()
@@ -341,16 +348,22 @@ const handleExport = async () => {
 /**
  * tableForm方法
  */
-const tableFormKeys = {}
+let tableFormKeys = {}
 CountPlanDetail.allSchemas.tableFormColumns.forEach((item) => {
   tableFormKeys[item.field] = item.default ? item.default : ''
 })
-const tableData = ref([])
+const tableData = ref([{
+    type: '',
+    value: ''
+  }])
 
 // 添加明细
 const handleAddTable = () => {
-  console.log(tableFormKeys)
-  tableFormKeys.formType = 'Select'
+  // tableFormKeys.formType=''
+  tableFormKeys = {
+    type: '',
+    value: ''
+  }
   tableData.value.push(JSON.parse(JSON.stringify(tableFormKeys)))
 }
 // 删除明细
@@ -360,7 +373,13 @@ const handleDeleteTable = (item, index) => {
 
 // 主子数据 提交
 const submitForm = async (formType, data) => {
-  data.subList = tableData.value // 拼接子表数据参数
+  data.subList = tableData.value.map(item=>{
+    return{
+      type:item.type,
+      value:item.value,
+    }
+  }) // 拼接子表数据参数
+  console.log(tableData.value)
   try {
     if (formType === 'create') {
       await CountPlanMainApi.createCountPlanMain(data)
@@ -404,7 +423,6 @@ const searchFormClick = (searchData) => {
 }
 // 选择盘点类型的时候针对限值的操作
 const selectChange = (field, val) => {
-  console.log(val)
   if (field == 'type') {
     if (val == 'DYNAMIC') {
       CountPlanMain.allSchemas.formSchema[3].label = '限值（%）'
@@ -421,74 +439,71 @@ const selectChange = (field, val) => {
     }
   }
 }
-let valueList = []
 // 选择盘点范围类型
-const formSelectChange = async (field, val, row) => {
-  console.log(row[field])
+const tableFormChange = async (field, val, row) => {
   console.log(field)
   console.log(val)
   if (field == 'type') {
     row.value = ''
-    if (row.type == 'OWNER' || row.type == 'SUPPLIER'|| row.type == 'CUSTOMER'|| row.type == 'ABC'|| row.type == 'ITEMS_TYPE'|| row.type == 'ITEMS_GROUP'||row.type == 'ITEMS_CODE'||row.type == 'WAREHOUSE_CODE'||row.type == 'AREABASIC_CODE'||row.type == 'LOCATIONGROUP_CODE'||row.type == 'LOCATION_CODE') {
+    if (
+      row.type == 'OWNER' ||
+      row.type == 'SUPPLIER' ||
+      row.type == 'CUSTOMER' ||
+      row.type == 'ABC' ||
+      row.type == 'ITEMS_TYPE' ||
+      row.type == 'ITEMS_GROUP' ||
+      row.type == 'ITEMS_CODE' ||
+      row.type == 'WAREHOUSE_CODE' ||
+      row.type == 'AREABASIC_CODE' ||
+      row.type == 'LOCATIONGROUP_CODE' ||
+      row.type == 'LOCATION_CODE'
+    ) {
+      row.formType = 'Select'
+      switch (row.type) {
+        case 'OWNER':
+          row.initOptions = ownerAllList.value
+          break
+        case 'SUPPLIER':
+          row.initOptions = supplierAllList.value
+          break
+        case 'CUSTOMER':
+          row.initOptions = customerAllList.value
+          break
+        case 'ABC':
+          row.initOptions = getStrDictOptions(DICT_TYPE.ABC_CLASS)
+          break
+        case 'ITEMS_TYPE':
+          row.initOptions = getStrDictOptions(DICT_TYPE.ITEM_TYPE)
+          break
+        case 'ITEMS_GROUP':
+          row.initOptions = getStrDictOptions(DICT_TYPE.ITEM_GROUP)
+          break
+        case 'ITEMS_CODE':
+          row.initOptions = itembasicAllList.value
+          break
+        case 'WAREHOUSE_CODE':
+          row.initOptions = warehouseAllList.value
+          break
+        case 'AREABASIC_CODE':
+          row.initOptions = areaAllList.value
+          break
+        case 'LOCATIONGROUP_CODE':
+          row.initOptions = locationgroupAllList.value
+          break
+        case 'LOCATION_CODE':
+          row.initOptions = locationAllList.value
+          break
+      }
+    } else if (row.type == 'PROJECT') {
       row.formType = 'InputString'
-      // row.initOptions = valueList
-    }else if(row.type == 'PROJECT'){
-      // row = {
-      //   type: 'InputString',
-      //   width: '300',
-      //   initOptions: valueList
-      // }
     }
   }
 }
 
-const formSelectvVisibleChange = async (field, val, row) => {
-  console.log(getStrDictOptions(DICT_TYPE.ABC_CLASS))
-  switch (row.type) {
-    case 'OWNER':
-      valueList = ownerAllList.value
-      break;
-    case 'SUPPLIER':
-      valueList = supplierAllList.value
-      break;
-    case 'CUSTOMER':
-    valueList = customerAllList.value
-    break;
-    case 'ABC':
-      valueList = getStrDictOptions(DICT_TYPE.ABC_CLASS)
-      break;
-    case 'ITEMS_TYPE':
-      valueList = getStrDictOptions(DICT_TYPE.ITEM_TYPE)
-      break;
-    case 'ITEMS_GROUP':
-      valueList = getStrDictOptions(DICT_TYPE.ITEM_GROUP)
-      break;
-    case 'ITEMS_CODE':
-      valueList =  itembasicAllList.value
-      break;
-    case 'WAREHOUSE_CODE':
-      valueList =  warehouseAllList.value
-      break
-    case 'AREABASIC_CODE':
-      valueList =  areaAllList.value
-      break
-    case 'LOCATIONGROUP_CODE':
-      valueList =  locationgroupAllList.value
-      break
-    case 'LOCATION_CODE':
-      valueList =  locationAllList.value
-      break
-  }
-  CountPlanDetail.allSchemas.tableFormColumns[1].tableForm = {
-    type: 'Select',
-    width: '300',
-    initOptions: valueList
-  }
-}
 const ownerAllList = ref()
 const supplierAllList = ref()
 const customerAllList = ref()
-const itembasicAllList =  ref()
+const itembasicAllList = ref()
 const warehouseAllList = ref()
 const areaAllList = ref()
 const locationgroupAllList = ref()
@@ -535,7 +550,7 @@ const getItembasicAllList = async () => {
 }
 // 获取仓库列表
 const getWarehouseAllList = async () => {
-  await WarehouseApi.getWarehouseList({available:'TRUE'}).then((res) => {
+  await WarehouseApi.getWarehouseList({ available: 'TRUE' }).then((res) => {
     res.forEach((element) => {
       element.value = element.code
       element.label = element.name
@@ -545,7 +560,7 @@ const getWarehouseAllList = async () => {
 }
 // 获取库区列表
 const getAreaAllList = async () => {
-  await AreaApi.getAreaList({available:'TRUE'}).then((res) => {
+  await AreaApi.getAreaList({ available: 'TRUE' }).then((res) => {
     res.forEach((element) => {
       element.value = element.code
       element.label = element.name
@@ -555,7 +570,7 @@ const getAreaAllList = async () => {
 }
 // 获取库位组列表
 const getLocationgroupAllList = async () => {
-  await LocationgroupApi.getLocationgroupList({available:'TRUE'}).then((res) => {
+  await LocationgroupApi.getLocationgroupList({ available: 'TRUE' }).then((res) => {
     res.forEach((element) => {
       element.value = element.code
       element.label = element.name
@@ -565,7 +580,7 @@ const getLocationgroupAllList = async () => {
 }
 // 获取库位列表
 const getLocationAllList = async () => {
-  await LocationpApi.getLocationList({available:'TRUE'}).then((res) => {
+  await LocationpApi.getLocationList({ available: 'TRUE' }).then((res) => {
     res.forEach((element) => {
       element.value = element.code
       element.label = element.name