diff --git a/src/api/wms/demandforecastingMain/index.ts b/src/api/wms/demandforecastingMain/index.ts
index 588fbd8bd..7d5596a8f 100644
--- a/src/api/wms/demandforecastingMain/index.ts
+++ b/src/api/wms/demandforecastingMain/index.ts
@@ -92,4 +92,12 @@ export const queryUserPlanerList = async () => {
 // 供应商代码
 export const querySupplierList = async (data) => {
   return await request.post({ url: `/wms/demandforecasting-main/querySupplierList`,data })
-}
\ No newline at end of file
+}
+
+
+// 是否已读接口
+export const updateIsRead = async (data) => {
+  return await request.post({ url: `/wms/demandforecasting-main/updateIsRead`,data })
+}
+
+
diff --git a/src/locales/en-US.ts b/src/locales/en-US.ts
index 19f98f6c5..03c07ece7 100644
--- a/src/locales/en-US.ts
+++ b/src/locales/en-US.ts
@@ -1138,7 +1138,8 @@ export default {
     批量发布:'Batch release',
     '重新生成标签会删除上次生成的标签，是否确认继续？':'Regenerating labels will delete the last generated label. Are you sure you want to continue?',
     '确 认':'Confirm',
-    请输入拒收原因:'Please enter the reason for rejection'
+    请输入拒收原因:'Please enter the reason for rejection',
+    全部已读:'All read'
   },
   
 
diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts
index 3b9c17161..7f47117c5 100644
--- a/src/locales/zh-CN.ts
+++ b/src/locales/zh-CN.ts
@@ -1138,7 +1138,9 @@ export default {
     批量发布:'批量发布',
     '重新生成标签会删除上次生成的标签，是否确认继续？':'重新生成标签会删除上次生成的标签，是否确认继续？',
     '确 认':'确 认',
-    请输入拒收原因:'请输入拒收原因'
+    请输入拒收原因:'请输入拒收原因',
+    全部已读:'全部已读'
+
   },
 
 }
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/demandforecastingMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/demandforecastingMain.data.ts
index 561ce9eee..2ae6c3e90 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/demandforecastingMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/demandforecastingMain.data.ts
@@ -1,288 +1,171 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
 import * as SupplierApi from '@/api/wms/supplier'
-import { Supplier } from '@/views/wms/basicDataManage/supplierManage/supplier/supplier.data'
+// import { Supplier } from '@/views/wms/basicDataManage/supplierManage/supplier/supplier.data'
 import * as SupplieritemApi from '@/api/wms/supplieritem'
 import { Supplieritem } from '@/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data'
+import * as ItembasicApi from '@/api/wms/itembasic'
+import {Itembasic} from "@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data";
 import * as PurchaseMainApi from '@/api/wms/purchaseMain'
 import * as PurchaseDetailApi from '@/api/wms/purchaseDetail'
 import { PurchaseDetail, PurchaseMain } from '../purchaseMain/purchaseMain.data'
+import * as DemandforecastingMainApi from '@/api/wms/demandforecastingMain'
+import * as DemandforecastingDetailApi from '@/api/wms/demandforecastingDetail'
+
 const { t } = useI18n() // 国际化
 
 /**
  * @returns {Array} 要货预测主表
  */
-export const DemandforecastingMain = useCrudSchemas(reactive<CrudSchema[]>([
+
+export const Version = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '单据号',
-    field: 'number',
+    label: '供应商代码',
+    field: 'supplerCodes',
     sort: 'custom',
-    table: {
-      width: 200,
-      fixed: 'left'
-    },
-    isForm: false,
-    isSearch: true,
+    isSearch:true,
   },
   {
-    label: '供应商代码',
-    field: 'supplierCode',
+    label: '订单号',
+    field: 'poNumber',
     sort: 'custom',
-    table: {
-      width: 150
-    },
-    isSearch: true,
-    form: {
-      labelMessage: '影响明细中物料代码，需在供应商物料中维护',
-      componentProps: {
-        enterSearch:true,
-        isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择供应商代码', // 输入框占位文本
-        searchField: 'code', // 查询弹窗赋值字段
-        searchTitle: '供应商信息', // 查询弹窗标题
-        searchAllSchemas: Supplier.allSchemas, // 查询弹窗所需类
-        searchPage: SupplierApi.getSupplierPageSCP, // 查询弹窗所需分页方法
-        searchCondition: [{
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        }]
-      }
-    }
+    isSearch:true,
   },
   {
-    label: '版本号',
-    field: 'version',
+    label: '订单行',
+    field: 'poLine',
     sort: 'custom',
-    table: {
-      width: 150
-    },
   },
   {
     label: '物料代码',
     field: 'itemCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
     isSearch:true,
-    isTable:false,
-    isForm: false,
-  },
-  {
-    label: '发布时间',
-    field: 'publishTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
     sort: 'custom',
-    table: {
-      width: 180
-    },
-    isTable: false,
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: { width: '100%' },
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
-      }
-    },
-    isForm: false,
   },
   {
-    label: '开始时间',
-    field: 'beginTime',
-    isTable: true,
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    isTable: false,
+    label: '子表版本',
+    field: 'detailVersion',
     sort: 'custom',
-    table: {
-      width: 180
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: { width: '100%' },
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
-      }
-    },
-    isForm: false,
-  },
+  }
+]))
+export const DemandforecastingMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '结束时间',
-    field: 'endTime',
-    isTable: true,
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    isTable: false,
+    label: '是否已读',
+    field: 'isRead',
     sort: 'custom',
     table: {
-      width: 180
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: { width: '100%' },
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
-      }
+      width: 150
     },
   },
   {
-    label: '业务类型',
-    field: 'businessType',
+    label: '订单号',
+    field: 'poNumber',
     sort: 'custom',
     table: {
       width: 150
     },
-    isTable:false,
-    isForm: false,
-    form: {
-      value: 'PurchasePrediction',
-      componentProps: {
-        disabled: true
-      }
-    }
   },
   {
-    label: '状态',
-    field: 'status',
-    dictType: DICT_TYPE.PURCHASE_ORDER_STATUS,
-    dictClass: 'string',
-    isTable: true,
-    isForm:false,
-    isSearch: true,
+    label: '订单行',
+    field: 'poLine',
     sort: 'custom',
     table: {
       width: 150
-    },
-    form: {
-      value: '1',
-      componentProps: {
-        disabled: true
-      }
     }
   },
   {
-    label: '备注',
-    field: 'remark',
+    label: '物料代码',
+    field: 'itemCode',
     sort: 'custom',
     table: {
       width: 150
     },
-    isTable: false,
-  },
-  {
-    label: '创建时间',
-    field: 'createTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isTable:false,
-    form: {
-      component: 'DatePicker',
+    isSearch:true,
+    isTable:true,
+    isForm: false,
+    search: {
+      // labelMessage: '信息提示说明！！！',
       componentProps: {
-        style: { width: '100%' },
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+        multiple: true,
+        enterSearch: true,
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+        searchField: 'itemCode', // 查询弹窗赋值字段
+        searchTitle: '物料基础信息', // 查询弹窗标题
+        searchAllSchemas: Supplieritem.allSchemas, // 查询弹窗所需类
+        searchPage: SupplieritemApi.getSupplieritemPageSCP, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'supplierCodes',
+          value: 'supplierCode',
+          message: '请填写供应商代码！',
+          isMainValue: true,
+          isCSV:true,//是否用逗号分隔参数
+        },{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
       }
-    },
-    isForm: false,
-  },
-  {
-    label: '创建者',
-    field: 'creator',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable:false,
-    isForm: false,
+    }
   },
   {
-    label: '是否可用',
-    field: 'available',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: true,
+    label: '版本号',
+    field: 'version',
     sort: 'custom',
     table: {
       width: 150
     },
-    form: {
-      component: 'Switch',
-      value: 'TRUE',
+    isSearch:true,
+    search: {
+      // labelMessage: '信息提示说明！！！',
       componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE'
+        multiple: true,
+        enterSearch: true,
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+        searchField: 'detailVersion', // 查询弹窗赋值字段
+        searchTitle: '版本号', // 查询弹窗标题
+        searchAllSchemas: Version.allSchemas, // 查询弹窗所需类
+        searchPage: DemandforecastingDetailApi.queryVersion, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'supplierCodes',
+          value: 'supplierCode',
+          message: '请填写供应商代码！',
+          isMainValue: true,
+          isCSV:true,//是否用逗号分隔参数
+        },{
+          key: 'itemCodes',
+          value: 'itemCode',
+          message: '请填写物料代码！',
+          isMainValue: true,
+          isCSV:true,//是否用逗号分隔参数
+        },{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
       }
-    },
-  },
-  {
-    label: '计划员',
-    field: 'planerId',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable:false,
-    isForm: false,
-  },
-  {
-    label: '计划员名称',
-    field: 'planerUserName',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable:false,
-    isForm: false,
-  },
-  {
-    label: '版本',
-    field: 'activeVersion',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable:false,
-    isForm: false,
+    }
   },
   {
     label: '到货日期',
     field: 'dueDate',
+    formatter: dateFormatter,
     sort: 'custom',
     table: {
       width: 150
     },
+    isSearch:true,
     isTable:false,
     isForm: false,
-  },
-  {
-    label: '操作',
-    field: 'action',
-    isDetail: false,
-    isForm: false,
-    table: {
-      width: 300,
-      fixed: 'right'
+    search: {
+      value:[],
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD',
+        type: 'daterange',
+        defaultTime: [new Date('1 '), new Date('1 ')]
+      }
     },
   }
 ]))
@@ -307,14 +190,6 @@ export const DemandforecastingMainRules = reactive({
  * @returns {Array} 要货预测子表
  */
 export const DemandforecastingDetail = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: '是否已读',
-    field: 'isRead',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
   {
     label: '单据号',
     field: 'number',
@@ -355,6 +230,7 @@ export const DemandforecastingDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable:false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -370,117 +246,7 @@ export const DemandforecastingDetail = useCrudSchemas(reactive<CrudSchema[]>([
       valueFormat: 'x',
     }
   },
-  {
-    label: '订单号',
-    field: 'poNumber',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    tableForm: {
-      isInpuFocusShow: true,
-      searchListPlaceholder: '请选择订单号',
-      searchField: 'number',
-      searchTitle: '采购订单信息',
-      searchAllSchemas: PurchaseMain.allSchemas,
-      searchPage: PurchaseMainApi.getPurchaseMainPage,
-      searchCondition: [{
-        key: 'available',
-        value: 'TRUE',
-        isMainValue: false
-      }, {
-        key: 'supplierCode',
-        value: 'supplierCode',
-        message: '请填写供应商代码！',
-        isMainValue: true
-      }
-        , {
-        key: 'status',
-        value: 2,
-        isMainValue: false
-      }
-      ]
-    },
-    form: {
-      // labelMessage: '信息提示说明！！！',
-      componentProps: {
-        isSearchList: true,
-        searchListPlaceholder: '请选择订单号',
-        searchField: 'number',
-        searchTitle: '采购订单信息',
-        searchAllSchemas: PurchaseMain.allSchemas,
-        searchPage: PurchaseMainApi.getPurchaseMainPage,
-        searchCondition: [{
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        }]
-      }
-    }
-  },
-  {
-    label: '订单行',
-    field: 'poLine',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      // labelMessage: '信息提示说明！！！',
-      componentProps: {
-        isSearchList: true,
-        searchListPlaceholder: '请选择订单行',
-        searchField: 'lineNumber',
-        searchTitle: '采购订单信息',
-        searchAllSchemas: PurchaseDetail.allSchemas,
-        searchPage: PurchaseDetailApi.getPurchaseDetailPage,
-        searchCondition: [{
-          key: 'number',
-          value: 'poNumber',
-          message: '请填写订单号！',
-          isMainValue: true
-        }, {
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        }]
-      }
-    },
-    tableForm: {
-      isInpuFocusShow: true,
-      searchListPlaceholder: '请选择订单行',
-      searchField: 'lineNumber',
-      searchTitle: '采购订单信息',
-      searchAllSchemas: PurchaseDetail.allSchemas,
-      searchPage: PurchaseDetailApi.getPurchaseDetailPage,
-      searchCondition: [{
-        key: 'number',
-        value: 'poNumber',
-        message: '请填写订单号！',
-        isMainValue: true
-      }, {
-        key: 'available',
-        value: 'TRUE',
-        isMainValue: false
-      }]
-    }
-  },
-  {
-    label: '物料代码',
-    field: 'itemCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      componentProps: {
-        disabled: true
-      }
-    },
-    tableForm: {
-      disabled: true
-    }
-  },
+  
   {
     label: '计量单位',
     field: 'uom',
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/index.vue
index bea1c5d35..9ce425e76 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/index.vue
@@ -1,23 +1,23 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="[...DemandforecastingMain.allSchemas.searchSchema,...DemandforecastingDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :showSearchTableQueryFields="['supplierCode','itemCode']" :hiddenFilterBtnFields="['supplierCode','itemCode']" :schema="DemandforecastingMain.allSchemas.searchSchema" @search="searchClick" @reset="searchClick" @searchTableSuccess="searchQueryTableSuccess"/>
   </ContentWrap>
 
-    <!-- 列表头部 -->
-    <TableHead
-      :HeadButttondata="HeadButttondata"
-      @button-base-click="buttonBaseClick"
-      :routeName="routeName"
-      @updataTableColumns="updataTableColumns"
-      @searchFormClick="searchFormClick"
-      :allSchemas="DemandforecastingMain.allSchemas"
-      :detailAllSchemas="DemandforecastingDetail.allSchemas"
-    />
+  <!-- 列表头部 -->
+  <TableHead
+    :HeadButttondata="HeadButttondata"
+    @button-base-click="buttonBaseClick"
+    :routeName="routeName"
+    @updataTableColumns="updataTableColumns"
+    @searchFormClick="searchFormClick"
+    :allSchemas="DemandforecastingMain.allSchemas"
+  />
 
   <!-- 列表 -->
   <ContentWrap>
-    <Table v-clientTable
+    <Table ref="tableRef" v-clientTable
+      :selection="true"
       :columns="tableColumns"
       :data="tableObject.tableList"
       :loading="tableObject.loading"
@@ -27,59 +27,20 @@
       v-model:pageSize="tableObject.pageSize"
       v-model:currentPage="tableObject.currentPage"
       v-model:sort="tableObject.sort"
+      @getSelectionRows="getSelectionRows"
     >
-      <template #number="{row}">
-        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
-          <span>{{ row.number }}</span>
-        </el-button>
-      </template>
-      <template #action="{ row,$index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
-      </template>
+    <template #isRead="{row}" >
+      <el-button v-show="row.isRead!=3" :type="row.isRead==1?'info':'primary'" link  @click="readHandle(row,false)">
+          <span>{{ row.isRead==1?'已读':'未读' }}</span>
+      </el-button>
+    </template>
+    <template v-for="name in tableObjectHead.tableList" :key="name" #[name]="{row}">
+      <span :class="{'success-text':row['planType_F'].indexOf(name)>-1}">{{ row[name] }}</span>
+    </template>
     </Table>
   </ContentWrap>
 
-  <!-- 表单弹窗：添加/修改 -->
-  <BasicForm
-    ref="formRef"
-    @success="getList"
-    :rules="DemandforecastingMainRules"
-    :formAllSchemas="DemandforecastingMain.allSchemas"
-    :tableAllSchemas="DemandforecastingDetail.allSchemas"
-    :tableFormRules="DemandforecastingDetailRules"
-    :tableData="tableData"
-    :apiUpdate="DemandforecastingMainApi.updateDemandforecastingMain"
-    :apiCreate="DemandforecastingMainApi.createDemandforecastingMain"
-    :isBusiness="true"
-    @handleAddTable="handleAddTable"
-    @handleDeleteTable="handleDeleteTable"
-    :isShowReduceButtonSelection="true"
-    @tableSelectionDelete="tableSelectionDelete"
-    @searchTableSuccess="searchTableSuccess"
-    @submitForm="submitForm"
-  />
-
-  <!-- 详情 -->
-  <Detail
-    ref="detailRef"
-    :isBasic="false"
-    :allSchemas="DemandforecastingMain.allSchemas"
-    :detailAllSchemas="DemandforecastingDetail.allSchemas"
-    :detailAllSchemasRules="DemandforecastingDetailRules"
-    :apiCreate="DemandforecastingDetailApi.createDemandforecastingDetail"
-    :apiUpdate="DemandforecastingDetailApi.updateDemandforecastingDetail"
-    :apiPage="DemandforecastingDetailApi.getDemandforecastingDetailPage"
-    :apiDelete="DemandforecastingDetailApi.deleteDemandforecastingDetail"
-    :Echo="Echo"
-    :detailButtonIsShowAdd="false"
-    :detailButtonIsShowEdit="false"
-    :detailButtonIsShowDelete="false"
-    @searchTableSuccessDetail="searchTableSuccessDetail"
-  />
 
-  <!-- 导入 -->
-  <ImportForm ref="importFormRef" url="/wms/demandforecasting-main/import" :importTemplateData="importTemplateData" 
-  @success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" />
 </template>
 
 <script setup lang="ts">
@@ -90,7 +51,7 @@ import * as DemandforecastingDetailApi from '@/api/wms/demandforecastingDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 
 // 要货预测
-defineOptions({ name: 'DemandforecastingSupplierMain' })
+defineOptions({ name: 'DemandforecastingMain' })
 
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
@@ -98,45 +59,59 @@ const { t } = useI18n() // 国际化
 const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
-const tableColumns = ref([...DemandforecastingMain.allSchemas.tableColumns,...DemandforecastingDetail.allSchemas.tableMainColumns])
-
+const orginTableColumns = ref(DemandforecastingMain.allSchemas.tableColumns)
+const tableColumns = ref(DemandforecastingMain.allSchemas.tableColumns)
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
-  tableColumns.value = val
+  orginTableColumns.value = val
 }
 
+
+
 // 查询页面返回
-const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
+const searchQueryTableSuccess = (formField, searchField, val, formRef, type, row ) => {
+  console.log('searchQueryTableSuccess',formField, searchField, val, formRef, type, row )
   nextTick(() => {
-    if (type == 'tableForm') {
-      // 明细查询页赋值
-      row[formField] = val[0][searchField]
-      if (formField == 'poLine') {
-        row['itemCode'] = val[0]['itemCode']
-        row['uom'] = val[0]['uom']
-        row['available'] = val[0]['available']
-      }
-    } else {
-      const setV = {}
+    const setV = {}
+    if(formField == 'supplierCode'||formField == 'itemCode'||formField == 'version'){
+      //供应商代码 物料代码 版本号
+      let list = []
+      val.forEach(item=>{
+        list.push(item[searchField])
+      })
+      setV[formField] = list.join(' ')
+      formRef.setValues(setV)
+    }else{
       setV[formField] = val[0][searchField]
       formRef.setValues(setV)
     }
   })
 }
-// 查询页面返回——详情
-const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
-  nextTick(() => {
-    const setV = {}
-    setV[formField] = val[0][searchField]
-    setV['itemCode'] = val[0]['code']
-    formRef.setValues(setV)
-  })
-}
 
-// 子表新增的时候选择表格之后需要会显得字段
-// const Echo = ['ppNumber','poLine', 'batch', 'altBatch', 'itemCode', 'itemName', 'itemDesc1', 'itemDesc2', 'projectCode', 'qty', 'uom']
-const Echo =  []
 
+const { tableObject:tableObjectHead, tableMethods:tableMethodsHead } = useTable({
+  getListApi: DemandforecastingDetailApi.getPageTableHead // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList:getListHead, setSearchParams:setSearchParamsHead } = tableMethodsHead
+
+watch(()=>tableObjectHead.tableList,()=>{
+  updateDateTableColumns()
+},{deep:true})
+const updateDateTableColumns = ()=>{
+  console.log('tableObjectHead',tableObjectHead)
+  let dateColumns = []
+  tableObjectHead.tableList.forEach(item=>{
+    dateColumns.push({
+      width:120,
+      field: item,
+      label: item
+    })
+  })
+  tableColumns.value  = [...orginTableColumns.value,...dateColumns]
+  console.log('tableColumns',tableColumns.value)
+}
 const { tableObject, tableMethods } = useTable({
   getListApi: DemandforecastingDetailApi.getDemandforecastingDetailPage // 分页接口
 })
@@ -146,29 +121,26 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
-  defaultButtons.defaultAddBtn({hasPermi:'wms:demandforecasting-main:create'}), // 新增
-  defaultButtons.defaultImportBtn({hasPermi:'wms:demandforecasting-main:import'}), // 导入
   defaultButtons.defaultExportBtn({hasPermi:'wms:demandforecasting-main:export'}), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
-  defaultButtons.defaultFilterBtn(null), // 筛选
+  // defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置
-  // {
-  //   label: '自定义扩展按钮',
-  //   name: 'zdy',
-  //   hide: false,
-  //   type: 'primary',
-  //   icon: 'Select',
-  //   color: ''
-  // },
+  {
+      label: t('ts.全部已读'),
+      name: 'read',
+      hide: false,
+      type: 'primary',
+      // icon: 'ep:operation',
+      color: '',
+      float:'left',
+      link: false, // 文本展现按钮
+      hasPermi: ''
+  }
 ]
 
 // 头部按钮事件
-const buttonBaseClick = (val, item) => {
-  if (val == 'add') { // 新增
-    openForm('create')
-  } else if (val == 'import') { // 导入
-    handleImport()
-  } else if (val == 'export') { // 导出
+const buttonBaseClick = async (val, item) => {
+  if (val == 'export') { // 导出
     handleExport()
   } else if (val == 'refresh') { // 刷新
     if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
@@ -176,156 +148,27 @@ const buttonBaseClick = (val, item) => {
         filters: tableObject.params.filters
       })
     } else {
+      await getListHead()
+      // updateDateTableColumns()
       getList()
+
     }
   } else if (val == 'filtrate') { // 筛选
+  } else if (val == 'read') { // 全部已读
+    readHandle(null,true)
   } else { // 其他按钮
     console.log('其他按钮', item)
   }
 }
 
-// 根据状态返回该按钮是否显示
-const isShowMainButton = (row,val) => {
-  if (val.indexOf(row.status) > -1) {
-    return false
-  } else {
-    return true
-  }
-}
-
-// 列表-操作按钮
-const butttondata = (row,$index) => {
-  const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
-  if(findIndex>-1&&findIndex<$index){
-    return []
-  }
-    return [
-       defaultButtons.mainListOrderCloBtn({ hide: isShowMainButton(row, ['1']) }), // 关闭
-       defaultButtons.mainListOrderOpeBtn({ hide: isShowMainButton(row, ['3']) }), // 打开
-       defaultButtons.mainListOrderPubBtn({ hide: isShowMainButton(row, ['1']) }), // 发布
-       defaultButtons.mainListOrderWitBtn({ hide: isShowMainButton(row, ['2']) }), // 下架
-       defaultButtons.mainListEditBtn({ hasPermi: 'wms:demandforecasting-main:update', hide: isShowMainButton(row, ['1']) }), // 编辑
-    ]
-}
-
-
-
-// 列表-操作按钮事件
-const buttonTableClick = async (val, row) => {
-  if (val == 'mainOrderClo') { // 关闭
-      handleClose(row.masterId)
-  } else if (val == 'mainOrderOpe') { // 打开
-      handleOpen(row.masterId)
-  } else if (val == 'mainOrderPub') { // 发布
-      handlePublish(row.masterId)
-  } else if (val == 'mainOrderWit') { // 下架
-      handleWit(row.masterId)
-  } else if (val == 'edit') { // 编辑
-    openForm('update', row)
-  } else if (val == 'delete') { // 删除
-    handleDelete(row.masterId)
-  }
-}
-
-/** 添加/修改操作 */
-const formRef = ref()
-const openForm =async (type: string, row?: number) => {
-  tableData.value = [] // 重置明细数据
-  formRef.value.open(type, row)
-}
-
-
-/** 关闭按钮操作 */
-const handleClose = async (id : number) => {
-    try {
-      // 关闭的二次确认
-      await message.confirm(t('ts.是否关闭所选中数据？'))
-      tableObject.loading = true
-      // 发起关闭
-      await DemandforecastingMainApi.closePurchaseMain(id)
-      message.success(t('ts.关闭成功!'))
-      tableObject.loading = false
-      // 刷新列表
-      await getList()
-    } catch { }finally{
-      tableObject.loading = false
-    }
-  }
-
-  /** 打开按钮操作 */
-  const handleOpen = async (id : number) => {
-    try {
-      // 打开的二次确认
-      await message.confirm(t('ts.是否打开所选中数据？'))
-      tableObject.loading = true
-      // 发起打开
-      await DemandforecastingMainApi.openPurchaseMain(id)
-      message.success(t('ts.打开成功!'))
-      tableObject.loading = false
-      // 刷新列表
-      await getList()
-    } catch { }finally{
-      tableObject.loading = false
-    }
-  }
-
-  /** 发布按钮操作 */
-  const handlePublish = async (id : number) => {
-    try {
-      // 发布的二次确认
-      await message.confirm(t('ts.是否发布所选中数据？'))
-      tableObject.loading = true
-      // 发起发布
-      await DemandforecastingMainApi.publishPurchaseMain(id)
-      message.success(t('ts.发布成功!'))
-      tableObject.loading = false
-      // 刷新列表
-      await getList()
-    } catch { }finally{
-      tableObject.loading = false
-    }
-  }
 
-  /** 下架按钮操作 */
-  const handleWit = async (id : number) => {
-    try {
-      // 下架的二次确认
-      await message.confirm(t('ts.是否下架所选中数据？'))
-      tableObject.loading = true
-      // 发起下架
-      await DemandforecastingMainApi.witPurchaseMain(id)
-      message.success(t('ts.下架成功!'))
-      tableObject.loading = false
-      // 刷新列表
-      await getList()
-    } catch { }finally{
-      tableObject.loading = false
-    }
-  }
 
-/** 详情操作 */
-const detailRef = ref()
-const openDetail = (row: any, titleName: any, titleValue: any) => {
-  detailRef.value.openDetail(row, titleName, titleValue,'planDemandforecastingMain')
+const searchClick = async (data)=>{
+  console.log('searchClick',data)
+  await setSearchParamsHead(data)
+  // updateDateTableColumns()
+  setSearchParams(data)
 }
-
-/** 删除按钮操作 */
-const handleDelete = async (id: number) => {
-  try {
-    // 删除的二次确认
-    await message.delConfirm()
-    tableObject.loading = true
-    // 发起删除
-    await DemandforecastingMainApi.deleteDemandforecastingMain(id)
-    message.success(t('common.delSuccess'))
-    tableObject.loading = false
-    // 刷新列表
-    await getList()
-  } catch {}finally{
-    tableObject.loading = false
-  }
-}
-
 /** 导出按钮操作 */
 const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
@@ -342,60 +185,6 @@ const handleExport = async () => {
   }
 }
 
-/**
-  * tableForm方法
-*/
-const tableFormKeys = {}
-DemandforecastingDetail.allSchemas.tableFormColumns.forEach(item => {
-  tableFormKeys[item.field] = item.default ? item.default : ''
-})
-const tableData = ref([])
-
-// 添加明细
-const handleAddTable = () => {
-  tableData.value.push(JSON.parse(JSON.stringify(tableFormKeys)))
-}
-// 删除明细
-// 删除明细
-const handleDeleteTable = (item, index) => {
-  let itemIndex = tableData.value.indexOf(item)
-  if(itemIndex>-1){
-    tableData.value.splice(itemIndex, 1)
-  }
-}
-const tableSelectionDelete = (selection) => {
-  tableData.value = tableData.value.filter(item => !selection.includes(item))
-}
-
-// 主子数据 提交
-const submitForm = async (formType, submitData) => {
-  let data = {...submitData}
-  if(data.masterId){
-    data.id = data.masterId
-  }
-  data.subList = tableData.value // 拼接子表数据参数
-  try {
-    if (formType === 'create') {
-      await DemandforecastingMainApi.createDemandforecastingMain(data)
-      message.success(t('common.createSuccess'))
-    } else {
-      data.id = data.masterId
-      await DemandforecastingMainApi.updateDemandforecastingMain(data)
-      message.success(t('common.updateSuccess'))
-    }
-    formRef.value.dialogVisible = false
-    // 刷新当前列表
-    getList()
-  } finally {
-    formRef.value.formLoading = false
-  }
-}
-
-/** 导入 */
-const importFormRef = ref()
-const handleImport = () => {
-  importFormRef.value.open()
-}
 
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
@@ -403,11 +192,6 @@ const importTemplateData = reactive({
   templateTitle: `${t('ts.要货预测主导入模版')}.xlsx`
 })
 
-// 导入成功之后
-const importSuccess = () => {
-  getList()
-}
-
 // 筛选提交
 const searchFormClick = (searchData) => {
   tableObject.params = {
@@ -417,9 +201,69 @@ const searchFormClick = (searchData) => {
   getList() // 刷新当前列表
 }
 
+const selectionRows = ref<any>([])
+const tableRef = ref()
+const getSelectionRows = (currentPage,currentPageSelectionRows) => {
+  console.log("getSelectionRows",currentPage,currentPageSelectionRows)
+  const currentRows = selectionRows.value.find(item=>item.currentPage==currentPage)
+  if(currentRows){
+    currentRows.selectionRows = currentPageSelectionRows
+  }else{
+    selectionRows.value.push({
+      currentPage,
+      selectionRows:currentPageSelectionRows
+    })
+  }
+}
+
+const readHandle = (row,isAll)=>{
+  let rows:any = []
+  if(isAll){
+    selectionRows.value.forEach(item=>{
+      let itemSelectionRows = item.selectionRows.filter(item1=>item1.isRead==0)
+      console.log('itemSelectionRows',itemSelectionRows)
+      rows = [...rows,...itemSelectionRows.map(item1=>item1.mainId)]
+    })
+    console.log('selectionRows',selectionRows)
+    console.log('全部已读',rows.join(','))
+  }else{
+    rows = [row.mainId]
+    console.log('已读',rows.join(','))
+  }
+  let getLoading = ElLoading.service({
+    lock: true,
+    text: 'loading...',
+    background: 'rgba(0, 0, 0, 0.7)'
+  })
+  if(selectionRows.value==0){
+    return
+  }
+  DemandforecastingMainApi.updateIsRead({isReadMainIds:rows.join(',')}).then(res => {
+    console.log('res',res);
+    getLoading?.close()
+    getList()
+    if(isAll){
+      selectionRows.value = []
+    }
+  }).catch(err => {
+    console.log(err)
+    getLoading?.close()
+  })
+  
+}
+
 /** 初始化 **/
 onMounted(async () => {
+  await getListHead()
+  // updateDateTableColumns()
   getList()
   importTemplateData.templateUrl = await DemandforecastingMainApi.importTemplate()
 })
 </script>
+<style lang="scss" scoped>
+
+.success-text{
+  color:var(--el-color-success);
+  font-weight:700;
+}
+</style>
\ No newline at end of file