From da218cfd0e2bb8b3353c18ffbb25a3a49c114f3d Mon Sep 17 00:00:00 2001
From: zhousq <zhoushaoqiang@sina.com>
Date: Wed, 27 Mar 2024 16:43:40 +0800
Subject: [PATCH 1/8] =?UTF-8?q?2024-3-27=20=E6=96=B0=E5=A2=9E=E6=97=A5?=
 =?UTF-8?q?=E8=AE=A1=E5=88=92=E5=8A=9F=E8=83=BD=EF=BC=8C=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?SearchTable=E5=8F=AF=E8=AE=BE=E7=BD=AE=E7=AD=9B=E9=80=89?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E7=9A=84=E9=9A=90=E8=97=8F=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/mes/orderDay/index.ts                 |  74 +++
 .../SearchTable/src/SearchTable.vue           |  24 +-
 src/utils/dict.ts                             |   5 +
 .../mes/orderDay/components/BasicFormV2.vue   | 559 ++++++++++++++++
 src/views/mes/orderDay/components/Detail.vue  | 597 ++++++++++++++++++
 src/views/mes/orderDay/index.vue              | 323 ++++++++++
 src/views/mes/orderDay/orderDay.data.ts       | 327 ++++++++++
 .../processroute/components/configDialog.vue  | 108 +++-
 .../mes/processroute/processroute.data.ts     |   2 +-
 9 files changed, 2006 insertions(+), 13 deletions(-)
 create mode 100644 src/api/mes/orderDay/index.ts
 create mode 100644 src/views/mes/orderDay/components/BasicFormV2.vue
 create mode 100644 src/views/mes/orderDay/components/Detail.vue
 create mode 100644 src/views/mes/orderDay/index.vue
 create mode 100644 src/views/mes/orderDay/orderDay.data.ts

diff --git a/src/api/mes/orderDay/index.ts b/src/api/mes/orderDay/index.ts
new file mode 100644
index 000000000..c4c95d3a0
--- /dev/null
+++ b/src/api/mes/orderDay/index.ts
@@ -0,0 +1,74 @@
+import request from '@/config/axios'
+
+export interface OrderDayVO {
+  status: string
+  remark: string
+  planNoMonth: string
+  planNoDay: string
+  productCode: string
+  workroomCode: string
+  lineCode: string
+  planCount: number
+  processrouteCode: string
+  tempProcessroute: string
+  standardBom: string
+  tempBom: string
+  workMode: string
+  planDate: Date
+  startTime: Date
+  endTime: Date
+  taskMode: string
+}
+
+// 查询生产日计划列表
+export const getOrderDayPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/mes/orderday/senior', data })
+  } else {
+    return await request.get({ url: `/mes/orderday/page`, params })
+  }
+}
+
+// 查询生产日计划详情
+export const getOrderDay = async (id: number) => {
+  return await request.get({ url: `/mes/orderday/get?id=` + id })
+}
+
+// 新增生产日计划
+export const createOrderDay = async (data: OrderDayVO) => {
+  return await request.post({ url: `/mes/orderday/create`, data })
+}
+
+// 修改生产日计划
+export const updateOrderDay = async (data: OrderDayVO) => {
+  return await request.put({ url: `/mes/orderday/update`, data })
+}
+
+// 删除生产日计划
+export const deleteOrderDay = async (id: number) => {
+  return await request.delete({ url: `/mes/orderday/delete?id=` + id })
+}
+
+// 导出生产日计划 Excel
+export const exportOrderDay = async (params) => {
+  return await request.download({ url: `/mes/orderday/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/mes/orderday/get-import-template' })
+}
+// 根据产品编码获取Bom
+export const getBoms = async (code: String)  => {
+  return request.get({ url: '/mes/common/geBomByProductCode?code='+code })
+}
+// 根据产品编码获取工艺路线
+export const getProcessroutes = async (code: String)  => {
+  return request.get({ url: '/mes/common/getProcessRouteByProductCode?code='+code })
+}
+// 根据车间编码获取产线列表
+export const getProductlines = async (code: String)  => {
+  return request.get({ url: '/mes/common/getLinesByWorkRoomCode?code='+code })
+}
diff --git a/src/components/SearchTable/src/SearchTable.vue b/src/components/SearchTable/src/SearchTable.vue
index 299c1070b..aaaabe0ad 100644
--- a/src/components/SearchTable/src/SearchTable.vue
+++ b/src/components/SearchTable/src/SearchTable.vue
@@ -48,11 +48,18 @@ routeName.value = route.name
 const searchDialogVisible = ref(false) // 弹窗的是否展示
 const dialogTitle = ref('') // 弹窗的标题
 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
-
+const filterButtonOptions=ref({
+    label: '筛选',
+    name: 'filtrate',
+    hide: false,
+    type: 'info',
+    icon: 'ep:operation',
+    color: '',
+    float:'right',
+    hasPermi: ''
+  })
 // 列表头部按钮
-const HeadButttondata = [
-  defaultButtons.defaultFilterBtn(null), // 筛选
-]
+const HeadButttondata = ref()
 
 /** 打开弹窗 */
 const getListRef = ref()
@@ -67,8 +74,12 @@ const typeRef = ref()
 const rowRef = ref()
 const allSchemasRef = ref()
 const multipleBol = ref(false)
+
 const searchConditionRef = ref()
-const open = (titleName: any, allSchemas: any,getApiPage: any, formField: any, searchField: any,multiple: any, type: any, row: any, searchCondition:any , isCountRequestRe:any ) => {
+const open = (titleName: any, allSchemas: any,getApiPage: any, formField: any, searchField: any,multiple: any, type: any, row: any, searchCondition:any , isCountRequestRe:any,isSearchFilterButtonHide:any ) => {
+  filterButtonOptions.value.hide=isSearchFilterButtonHide?isSearchFilterButtonHide:false
+  HeadButttondata.value=[ defaultButtons.defaultFilterBtn(filterButtonOptions.value)], // 筛选]
+  //console.log(filterButtonOptions.value)
   searchDialogVisible.value = true
   formFieldRef.value = formField
   searchFieldRef.value = searchField
@@ -87,13 +98,14 @@ const open = (titleName: any, allSchemas: any,getApiPage: any, formField: any, s
   tableObjectRef.value = tableObject
   searchConditionRef.value = searchCondition
   if (searchCondition) tableObjectRef.value.params = searchCondition;
-
+  
   // 获得表格的各种操作
   const { getList } = tableMethods
   // setSearchParamsRef.value = setSearchParams
   setSearchParamsRef.value = tableObject.params
   getListRef.value = getList
   getList()
+  
 }
 
 // 筛选提交
diff --git a/src/utils/dict.ts b/src/utils/dict.ts
index 4dc76cd96..97d17d36b 100644
--- a/src/utils/dict.ts
+++ b/src/utils/dict.ts
@@ -276,4 +276,9 @@ export enum DICT_TYPE {
   PACK_UNIT_TYPE = 'pack_unit_type', // 包装规格类型
   TRANSFER_REASON = 'transfer_reason', // 调拨出入库原因
   PURCHASERECEIPT_SOURCE_TYPE="purchasereceipt_source_type",//采购收货数据来源
+// ========== 业务 - mes ==========
+  MESDO_STATUS= 'mes_do_status', // 工单执行状态
+  MES_WORKBILL_MODEL='mes_workbill_model',// 工单模式 单工单（根据产品数量生成多个工单）、批量工单（一个产品一个工单）
+  MES_TASK_MODE='mes_task_mode', //生产模式 派工方式、领工方式
+  MES_PLANDO_STATUS='mes_plando_status' //计划执行状态
 }
diff --git a/src/views/mes/orderDay/components/BasicFormV2.vue b/src/views/mes/orderDay/components/BasicFormV2.vue
new file mode 100644
index 000000000..4a242098b
--- /dev/null
+++ b/src/views/mes/orderDay/components/BasicFormV2.vue
@@ -0,0 +1,559 @@
+<template>
+  <Dialog
+    :title="dialogTitle"
+    v-model="dialogVisible"
+    :width="dialogWidth"
+    :close-on-click-modal="false"
+  >
+  <div style="max-height: 60vh;overflow-y: auto;">
+    <Form
+      ref="formRef"
+      v-loading="formLoading"
+      :rules="rules"
+      :schema="formSchema"
+      :is-col="true"
+      @opensearchTable="opensearchTable"
+      @onChange="onChange"
+      @onBlur="onBlur" />
+  </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'
+
+const props = defineProps({
+  // 查询弹窗是否显示筛选按钮
+  isSearchFilterButtonHide: {
+    type: Boolean,
+    default: false
+  },
+  // 显示窗口宽度设置
+  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
+  },
+  // 窗体底部按钮：保存，关闭
+  isShowFooterButtton: {
+    type: Boolean,
+    required: false,
+    default: true
+  },
+  // 明细数据长度校验
+  tableFormDataLength: {
+    type: Boolean,
+    required: false,
+    default: true
+  }
+})
+
+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 searchFilterButtonHide=ref(props.isSearchFilterButtonHide)
+// 列表-按钮
+// 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,
+    false,
+    searchFilterButtonHide.value
+  )
+}
+// 弹层确定返回所选数据
+// 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，number参数
+  if (masterParmas) {
+    if (!row) {
+      row = {
+        masterId: masterParmas.masterId,
+        number: masterParmas.number
+      }
+    }
+  }
+  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) // 关闭
+  ]
+}
+
+/** 按钮事件 */
+const buttonBaseClick = (val) => {
+  // 保存
+  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()
+      formRef.value.setValues({status:'1'})
+      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'
+])
+//普通下拉改变事件
+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 = () => {
+  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/views/mes/orderDay/components/Detail.vue b/src/views/mes/orderDay/components/Detail.vue
new file mode 100644
index 000000000..4b25bc3ee
--- /dev/null
+++ b/src/views/mes/orderDay/components/Detail.vue
@@ -0,0 +1,597 @@
+<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>
+      <div class="flex mt-20px">
+        <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>
+   
+  </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 * as RemarkApi from '@/api/wms/remark'
+import * as FileApi from '@/api/wms/file'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+
+defineOptions({ name: 'Detail' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+routeName.value = routeName.value.substring(0, routeName.value.length - 4) + 'Detail'
+const updateKey = ref(0)
+
+const props = defineProps({
+  // 标签参数
+  tabs: {
+    type: Object,
+    required: true,
+    default: null
+  },
+  // 是否是基础数据 展现详情顶部表单
+  isBasic: {
+    type: Boolean,
+    required: false,
+    default: false
+  },
+  // 表单，列表 相关信息
+  allSchemas: {
+    type: Object,
+    required: true,
+    default: null
+  },
+  // 明细列表相关信息
+  detailAllSchemas: {
+    type: Object,
+    required: true,
+    default: null
+  },
+  //  明细验证
+  detailAllSchemasRules: {
+    type: Object,
+    required: true,
+    default: null
+  },
+  // 子表新增API
+  apiCreate: {
+    type: Function,
+    required: false,
+    default: null
+  },
+  // 子表编辑API
+  apiUpdate: {
+    type: Function,
+    required: false,
+    default: null
+  },
+  // 子表分页列表API
+  apiPage: {
+    type: Function,
+    required: false,
+    default: null
+  },
+  // 子表删除API
+  apiDelete: {
+    type: Function,
+    required: false,
+    default: null
+  },
+  // 子表新增修改校验
+  detailValidate: {
+    type: Function,
+    required: false,
+    default: null
+  },
+  // 来源 countPlan盘点计划进入
+  fromeWhere: {
+    type: String,
+    required: false,
+    default: ''
+  },
+  // 获取接口列表集合
+  allList: {
+    type: Object,
+    required: true,
+    default: null
+  },
+  // 盘点范围类型
+  countScopeType: {
+    type: Array,
+    required: false,
+    default: null
+  },
+  //盘点详情子表新增的时候判断盘点范围值显示输入框还是下拉框
+  formTypeDetail: {
+    type: String,
+    required: false,
+    default: 'InputString'
+  },
+  //盘点详情子表新增的时候判断盘点范围值的下拉列表
+  countPlanAllList: {
+    type: Array,
+    required: false,
+    default: null
+  },
+  // 详情列表扩展操作按钮
+  buttondataTable: {
+    type: Array,
+    required: false,
+    default: ()=>{
+      return []
+    }
+  },
+  // 针对基础数据tabs扩展 显示table列表 默认false
+  tabsExtend: {
+    type: Boolean,
+    required: false,
+    default: false
+  },
+  // tableObject 数据过滤条件 针对 详情扩展标签页 传入不同条件
+  tableObjectExtend: {
+    type: Array,
+    required: false,
+    default: null
+  },
+  // 子列表 筛选 展示与隐藏 ，默认展示
+  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
+  }
+})
+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 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
+  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
+    }
+    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
+  }
+}
+
+// 获得表格的各种操作
+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)
+  } else {
+    emit('tableFormButton',val, row)
+  }
+}
+/** 添加/修改操作 */
+const openForm = async (type: string, row?: number) => {
+  formRef.value.open(type, row, masterParmas.value)
+  emit('detailOpenForm', type, row)
+}
+// form 提交
+const submitForm = async (formType, data) => {
+  try {
+    // 子表新增编辑校验 如果业务需要子表提交校验 需在主页详情组件添加 detailValidate 参数及方法
+    const rs = (await props.detailValidate) ? await props.detailValidate(data) : true
+    if (!rs) return
+    if (formType === 'create') {
+      await props.apiCreate(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await props.apiUpdate(data)
+      message.success(t('common.updateSuccess'))
+    }
+    formRef.value.dialogVisible = false
+    // 刷新当前列表
+    await getList()
+    updateKey.value += 1
+  } finally {
+    formRef.value.formLoading = false
+  }
+}
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef) => {
+  emit('searchTableSuccessDetail', formField, searchField, val, formRef)
+}
+// 传递给父类
+const emit = defineEmits([
+  'searchTableSuccessDetail',
+  'changeTabs',
+  'selectChangeDetail',
+  'detailOpenForm',
+  'tableFormButton',
+  'openImage',
+  '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)
+}
+
+/**
+ * 监听失焦事件
+ * @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/mes/orderDay/index.vue b/src/views/mes/orderDay/index.vue
new file mode 100644
index 000000000..4ed4babe6
--- /dev/null
+++ b/src/views/mes/orderDay/index.vue
@@ -0,0 +1,323 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search
+      :schema="OrderDay.allSchemas.searchSchema"
+      @search="setSearchParams"
+      @reset="setSearchParams"
+    />
+  </ContentWrap>
+
+  <!-- 列表头部 -->
+  <TableHead
+    :HeadButttondata="HeadButttondata"
+    @button-base-click="buttonBaseClick"
+    :routeName="routeName"
+    @updataTableColumns="updataTableColumns"
+    @searchFormClick="searchFormClick"
+    :allSchemas="OrderDay.allSchemas"
+  />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #planNoDay="{ row }">
+        <el-button type="primary" link @click="openDetail(row, '计划编码', row.planNoDay)">
+          <span>{{ row.planNoDay }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase
+          :Butttondata="butttondata(row)"
+          @button-base-click="buttonTableClick($event, row)"
+        />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicFormV2
+    ref="basicFormRef"
+    @success="formsSuccess"
+    :rules="OrderDayRules"
+    :formAllSchemas="OrderDay.allSchemas"
+    :apiUpdate="OrderDayApi.updateOrderDay"
+    :apiCreate="OrderDayApi.createOrderDay"
+    @searchTableSuccess="searchTableSuccess"
+    :isBusiness="false"
+    :isSearchFilterButtonHide="true"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="OrderDay.allSchemas" />
+
+  <!-- 导入 -->
+  <ImportForm
+    ref="importFormRef"
+    url="/mes/orderday/import"
+    :importTemplateData="importTemplateData"
+    @success="importSuccess"
+  />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { OrderDay,OrderDayRules } from './orderDay.data'
+import * as OrderDayApi from '@/api/mes/orderDay'
+import BasicFormV2 from './components/BasicFormV2.vue'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import TableHead from '@/components/TableHead/src/TableHead.vue'
+import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+import Detail from '@/components/Detail/src/Detail.vue'
+
+defineOptions({ name: 'MesOrderDay' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(OrderDay.allSchemas.tableColumns)
+const  lineOptions=ref([])
+const  processRouteOptions=ref([])
+const bomOptions=ref([])
+//**获取 工序信息 */
+const getProcessroutes = async (code: String) => {
+  processRouteOptions.value = await OrderDayApi.getProcessroutes(code)
+  OrderDay.allSchemas.formSchema.forEach(item => {
+      if (item.field == 'processrouteCode') {
+        console.log('processrouteCode',item.field)
+        item.componentProps.options = processRouteOptions.value
+      }
+    })
+}
+const getProductlines = async (code: String) => {
+  lineOptions.value = await OrderDayApi.getProductlines(code)
+  OrderDay.allSchemas.formSchema.forEach(item => {
+      if (item.field == 'lineCode') {
+        item.componentProps.options = lineOptions.value
+      }
+    })
+}
+const getBoms = async (code: String) => {
+  bomOptions.value = await OrderDayApi.getBoms(code)
+  OrderDay.allSchemas.formSchema.forEach(item => {
+      if (item.field == 'standardBom') {
+        item.componentProps.options = bomOptions.value
+      }
+    })
+}
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef) => {
+  nextTick(() => {
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    formRef.setValues(setV)
+    if(formField=='productCode'){
+      //formRef.setValues({standardBom:'bomddd'})
+      getProcessroutes(val[0][searchField])
+      getBoms(val[0][searchField])
+    }
+    if(formField=='workroomCode'){
+      getProductlines(val[0][searchField])
+    }
+    
+})
+
+}
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: OrderDayApi.getOrderDayPage // 分页接口
+
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'mes:orderDay:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'mes:orderDay:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'mes:orderDay:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+]
+
+// 头部按钮事件
+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 isShowMainButton = (row,val) => {
+  //console.log('row',row)
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+// 列表-操作按钮
+// 列表-操作按钮
+const butttondata = (row) => {
+     //console.log('row2',row)
+    return [
+    defaultButtons.mainListEditBtn({ hide: isShowMainButton(row,['1']),hasPermi:'mes:orderDay:update'}), // 编辑
+    defaultButtons.mainListDeleteBtn({ hide: isShowMainButton(row,['1']),hasPermi:'mes:orderDay:delete'}), // 删除
+    defaultButtons.mainListHandleBtn({label: '排产',
+      name: 'schedule',
+      hide: isShowMainButton(row,['1']),
+      type: 'warning',
+      icon: '',
+      color: '',
+      hasPermi: ''}), // 
+    defaultButtons.mainListHandleBtn({label: '发布',
+      name: 'publish',
+      hide: isShowMainButton(row,['2']),
+      type: 'warning',
+      icon: '',
+      color: '',
+      hasPermi: ''}), // 路由设置
+      defaultButtons.mainListHandleBtn({label: '终止',
+      name: 'publish',
+      hide: isShowMainButton(row,['1','2','3']),
+      type: 'warning',
+      icon: '',
+      color: '',
+      hasPermi: ''}), // 路由设置
+    ]
+}
+
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  basicFormRef.value.open(type, row)
+}
+
+// form表单提交
+const formsSuccess = async (formType,data) => {
+  var isHave =OrderDay.allSchemas.formSchema.some(function (item) {
+    return item.field === 'activeTime' || item.field === 'expireTime';
+  });
+  if(isHave){
+    if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
+      message.error('失效时间要大于生效时间')
+      return;
+    }
+  }
+  if(data.activeTime==0)data.activeTime = null;
+  if(data.expireTime==0)data.expireTime = null;
+  if (formType === 'create') {
+    await OrderDayApi.createOrderDay(data)
+    message.success(t('common.createSuccess'))
+  } else {
+    await OrderDayApi.updateOrderDay(data)
+    message.success(t('common.updateSuccess'))
+  }
+  basicFormRef.value.dialogVisible = false
+  getList()
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicOrderDay')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await OrderDayApi.deleteOrderDay(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await OrderDayApi.exportOrderDay(tableObject.params)
+    download.excel(data, '生产日计划.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '生产日计划导入模版.xlsx'
+})
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await OrderDayApi.importTemplate()
+})
+
+</script>
diff --git a/src/views/mes/orderDay/orderDay.data.ts b/src/views/mes/orderDay/orderDay.data.ts
new file mode 100644
index 000000000..ddaf2c82a
--- /dev/null
+++ b/src/views/mes/orderDay/orderDay.data.ts
@@ -0,0 +1,327 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+import * as ItembasicApi from '@/api/wms/itembasic'
+import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data'
+import * as WorkshopApi from '@/api/wms/workshop'
+import { Workshop } from '@/views/wms/basicDataManage/factoryModeling/workshop/workshop.data'
+import { on } from '@/utils/domUtils'
+
+// 表单校验
+export const OrderDayRules = reactive({
+  planNoDay: [
+    { required: true, message: '请输入一个日计划编号', trigger: 'blur' }
+  ],
+  planNoMonth: [
+    { required: true, message: '请输入一个月计划编号', trigger: 'blur' }
+  ],
+  productCode: [
+    { required: true, message: '请选择一个产品', trigger: 'blur' }
+  ],
+  workroomCode: [
+    { required: true, message: '请选择一个车间', trigger: 'blur' }
+  ],
+  lineCode: [
+    { required: true, message: '请选择一个产线', trigger: 'blur' }
+  ],
+  workMode: [
+    { required: true, message: '请选择工单生成方式', trigger: 'blur' }
+  ],
+  startTime: [
+    { required: true, message: '请输入计划生产开始时间', trigger: 'blur' }
+  ],
+  endTime: [
+    { required: true, message: '请输入计划生产完成时间', trigger: 'blur' }
+  ],
+  planDate: [
+    { required: true, message: '请输入计划日期', trigger: 'blur' }
+  ],
+  taskMode: [
+    { required: true, message: '请选择一个生产方式', trigger: 'blur' }
+  ],
+})
+
+export const OrderDay = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '主键',
+    field: 'id',
+    sort: 'custom',
+    isForm: false,
+    width: '60px',
+  },
+  {
+    label: '日计划单号',
+    field: 'planNoDay',
+    sort: 'custom',
+    isSearch: true,
+    required: true,
+  },
+  {
+    label: '月计划单号',
+    field: 'planNoMonth',
+    sort: 'custom',
+    isSearch: true,
+    required: false,
+  },
+  {
+    label: '状态',
+    field: 'status',
+    sort: 'custom',
+    isForm: false,
+    isTable: true,
+    isDetail:true,
+    isSearch: false,
+    width: '80px',
+    dictType: DICT_TYPE.MES_PLANDO_STATUS,
+    dictClass: 'string',
+    form: {
+      component: 'Select',
+    },
+  },
+  {
+    label: '产品编号',
+    field: 'productCode',
+    sort: 'custom',
+    isSearch: true,
+    required: true,
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '产品编码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '产品信息', // 查询弹窗标题
+        searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
+        searchPage: ItembasicApi.getItembasicPage, // 查询弹窗所需分页方法
+        isHideFilterButton:true,
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        },
+        {
+          key: 'type',
+          action: 'in', // 查询拼接条件
+          isSearch: true, // 使用自定义拼接条件
+          value: 'FG,SEMI',//,SEMI]
+          isMainValue: false
+        },
+       
+        ]
+      }
+    }
+  },
+  {
+    label: '车间编码',
+    field: 'workroomCode',
+    sort: 'custom',
+    isSearch: true,
+    required: true,
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '车间', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '车间信息', // 查询弹窗标题
+        searchAllSchemas: Workshop.allSchemas, // 查询弹窗所需类
+        searchPage: WorkshopApi.getWorkshopPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    },
+    
+  },
+  {
+    label: '产线编码',
+    field: 'lineCode',
+    sort: 'custom',
+    isSearch: true,
+    required: true,
+    form:{
+      component:'Select',
+      componentProps:{
+        options:[{lablel:'1',value:'1'}]
+      }
+    }
+  },
+  {
+    label: '计划数量',
+    field: 'planCount',
+    sort: 'custom',
+    required: true,
+    form: {
+      component: 'InputNumber',
+      value: 1
+    },
+  },
+  {
+    label: '工艺路线编码',
+    field: 'processrouteCode',
+    sort: 'custom',
+    form: {
+      component:'Select',
+      componentProps: {
+        options: []
+      }
+    }
+  },
+  {
+    label: '临时工艺',
+    field: 'tempProcessroute',
+    sort: 'custom',
+    width: '80px',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+  },
+  {
+    label: 'BOM编码',
+    field: 'standardBom',
+    sort: 'custom',
+    form: {
+      component:'Select',
+      componentProps: {
+        options: [{lablel:'bom',value:'bom'}]
+      }
+    }
+  },
+  {
+    label: '替代BOM',
+    field: 'tempBom',
+    sort: 'custom',
+    width: '80px',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+      }
+    }
+  },
+  {
+    label: '工单模式',
+    field: 'workMode',
+    width: '80px',
+    sort: 'custom',
+    dictType: DICT_TYPE.MES_WORKBILL_MODEL,
+    dictClass: 'string',
+    form: {
+      component: 'Select',
+      value: 'BATCH',
+    },
+  },
+  {
+    label: '计划日期',
+    field: 'planDate',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isSearch: true,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'date',
+        valueFormat: 'YYYY-MM-DD',
+      }
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'date',
+        valueFormat: 'x'
+      }
+    },
+  },
+  {
+    label: '开始时间',
+    field: 'startTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    required: true,
+    form: {
+      component: 'TimePicker',
+      componentProps: {
+        type: 'time',
+        dateFormat: 'HH:mm',
+        //valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '结束时间',
+    field: 'endTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isReadonly:true,
+    form: {
+      component: 'TimePicker',
+      componentProps: {
+        type: 'time',
+        dateFormat: 'HH:mm',
+      }
+    },
+  },
+  {
+    label: '生产模式',
+    field: 'taskMode',
+    width : '80px',
+    sort: 'custom',
+    dictType: DICT_TYPE.MES_TASK_MODE,
+    dictClass: 'string',
+    form: {
+      component: 'Select',
+      value:'ASSIGN'
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isSearch: true,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'datetime',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    isSearch: true,
+    isForm: false,
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    isSearch: false,
+    isTable:false,
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 200,
+      fixed: 'right'
+    }
+  }
+]))
diff --git a/src/views/mes/processroute/components/configDialog.vue b/src/views/mes/processroute/components/configDialog.vue
index 3f041b99b..5e1be6f27 100644
--- a/src/views/mes/processroute/components/configDialog.vue
+++ b/src/views/mes/processroute/components/configDialog.vue
@@ -43,7 +43,27 @@
             <el-table-column prop="code" label="工序编码" width="180" v-if="false" />
           </el-table>
         </el-col>
-        <el-col :span="18"><div ref="graphContainer"></div></el-col>
+        <el-col :span="12"><div ref="graphContainer"></div></el-col>
+        <el-col :span="6">
+          <ContentWrap class="w-[100%] 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>
+        </el-col>
+          
       </el-row>
       <el-row style="height: 150px" :gutter="5">
         <el-col :span="6">
@@ -65,7 +85,10 @@
                 <span>设备信息</span>
               </div>
             </template>
-            <p v-for="item in deviceList" :key="item" class="text item">{{ item.name }}</p>
+            <el-table :data="deviceList" ref="tabledeviceList">
+              <el-table-column prop="name" label="设备名称" />
+              <el-table-column prop="code" label="设备编号" />
+            </el-table>
           </el-card></el-col
         >
         <el-col :span="6"
@@ -75,7 +98,11 @@
                 <span>人员信息</span>
               </div>
             </template>
-            <p v-for="item in workerList" :key="item" class="text item">{{ item.name }}</p>
+            <el-table :data="workerList" ref="tableWorker">
+              <el-table-column prop="name" label="人员姓名" />
+              <el-table-column prop="code" label="班组名称" />
+            </el-table>
+            
           </el-card></el-col
         >
         <el-col :span="6"
@@ -85,8 +112,11 @@
                 <span>工位信息</span>
               </div>
             </template>
-            <p>工位编码：{{ workStationData.name }}</p>
-            <p>工位名称：{{ workStationData.code }}</p>
+            <el-table :data="workStationData" ref="tableWorkStation">
+              <el-table-column prop="name" label="工位编码" />
+              <el-table-column prop="code" label="工位名称" />
+            </el-table>
+            
           </el-card></el-col
         >
       </el-row>
@@ -94,6 +124,11 @@
   </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 * as RemarkApi from '@/api/wms/remark'
+import * as FileApi from '@/api/wms/file'
 import { start_node, end_node, createGraph, registerNodes, getNewNode } from './graphbase.data'
 import * as ProcessrouteApi from '@/api/mes/processroute'
 import { Search } from '@/components/Search'
@@ -123,12 +158,32 @@ const deviceList = ref([
   { name: '设备', code: '0000' },
   { name: '设备', code: '0000' }
 ]) //设备数据
+
+// 附件默认数据
+const annexData = reactive({
+  annexList: []
+})
+
+// 备注数据
+const remarksData = reactive({
+  remarksList: [],
+  data: {}
+})
+
+// 变更记录默认数据
+const changeRecordData = reactive({
+  changeRecordList: []
+})
 const workerList = ref([{ name: '--' }, { name: '--' }]) //人员数据
-const workStationData = ref({ name: '工位', code: '' }) //工位数据
+const workStationData = ref([{ name: '工位', code: '' }]) //工位数据
 //初始化图形组件
 const graph = ref<Graph>()
 const openDetail = async (rowData: any) => {
   rowData.value = rowData
+  remarksData.data = {
+    tableId: rowData.value.id,
+    tableName: rowData.value.processrouteCode
+  }
   titleNameRef.value = rowData.value.processrouteCode
   titleValueRef.value = rowData.value.processName
   processRouteId.value = rowData.value.id
@@ -142,6 +197,9 @@ const openDetail = async (rowData: any) => {
     graph.value.fromJSON(graphJson.cells)
   })
   getItembasicInfo(rowData.value.productCode)
+  getRemarkList()
+  getFileList()
+  getChangeRecordList()
 }
 //关闭后销毁图形组件
 const handleDrawerClose = () => {
@@ -277,6 +335,44 @@ const saveResult = async () => {
 // 验证图形
 onUnmounted(() => {})
 const emit = defineEmits(['close'])
+// 获取附件列表篇
+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()
+}
+// 获取备注列表
+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)
+}
 </script>
 <style lang="scss">
 .el-drawer__body {
diff --git a/src/views/mes/processroute/processroute.data.ts b/src/views/mes/processroute/processroute.data.ts
index fb82886cf..5da2fee60 100644
--- a/src/views/mes/processroute/processroute.data.ts
+++ b/src/views/mes/processroute/processroute.data.ts
@@ -80,7 +80,7 @@ export const Processroute = useCrudSchemas(reactive<CrudSchema[]>([
       // labelMessage: '信息提示说明！！！',
       componentProps: {
         isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+        searchListPlaceholder: '产品编码', // 输入框占位文本
         searchField: 'code', // 查询弹窗赋值字段
         searchTitle: '产品信息', // 查询弹窗标题
         searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类

From 647cc93b83ebf02bb28290ed515da14cee60ba12 Mon Sep 17 00:00:00 2001
From: zhousq <zhoushaoqiang@sina.com>
Date: Thu, 28 Mar 2024 08:20:40 +0800
Subject: [PATCH 2/8] =?UTF-8?q?2024-3-28=20=E7=94=9F=E4=BA=A7=E6=97=A5?=
 =?UTF-8?q?=E8=AE=A1=E5=88=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/mes/orderDay/index.ts                 |   1 -
 .../mes/orderDay/components/BasicFormV2.vue   |   1 -
 .../mes/orderDay/components/sechuled.vue      | 597 ++++++++++++++++++
 src/views/mes/orderDay/index.vue              |   3 +-
 src/views/mes/orderDay/orderDay.data.ts       |   2 +-
 5 files changed, 600 insertions(+), 4 deletions(-)
 create mode 100644 src/views/mes/orderDay/components/sechuled.vue

diff --git a/src/api/mes/orderDay/index.ts b/src/api/mes/orderDay/index.ts
index c4c95d3a0..7c28e112c 100644
--- a/src/api/mes/orderDay/index.ts
+++ b/src/api/mes/orderDay/index.ts
@@ -55,7 +55,6 @@ export const deleteOrderDay = async (id: number) => {
 export const exportOrderDay = async (params) => {
   return await request.download({ url: `/mes/orderday/export-excel`, params })
 }
-
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/mes/orderday/get-import-template' })
diff --git a/src/views/mes/orderDay/components/BasicFormV2.vue b/src/views/mes/orderDay/components/BasicFormV2.vue
index 4a242098b..9856ae0d6 100644
--- a/src/views/mes/orderDay/components/BasicFormV2.vue
+++ b/src/views/mes/orderDay/components/BasicFormV2.vue
@@ -26,7 +26,6 @@
 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'
 
 const props = defineProps({
   // 查询弹窗是否显示筛选按钮
diff --git a/src/views/mes/orderDay/components/sechuled.vue b/src/views/mes/orderDay/components/sechuled.vue
new file mode 100644
index 000000000..4b25bc3ee
--- /dev/null
+++ b/src/views/mes/orderDay/components/sechuled.vue
@@ -0,0 +1,597 @@
+<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>
+      <div class="flex mt-20px">
+        <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>
+   
+  </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 * as RemarkApi from '@/api/wms/remark'
+import * as FileApi from '@/api/wms/file'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+
+defineOptions({ name: 'Detail' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+routeName.value = routeName.value.substring(0, routeName.value.length - 4) + 'Detail'
+const updateKey = ref(0)
+
+const props = defineProps({
+  // 标签参数
+  tabs: {
+    type: Object,
+    required: true,
+    default: null
+  },
+  // 是否是基础数据 展现详情顶部表单
+  isBasic: {
+    type: Boolean,
+    required: false,
+    default: false
+  },
+  // 表单，列表 相关信息
+  allSchemas: {
+    type: Object,
+    required: true,
+    default: null
+  },
+  // 明细列表相关信息
+  detailAllSchemas: {
+    type: Object,
+    required: true,
+    default: null
+  },
+  //  明细验证
+  detailAllSchemasRules: {
+    type: Object,
+    required: true,
+    default: null
+  },
+  // 子表新增API
+  apiCreate: {
+    type: Function,
+    required: false,
+    default: null
+  },
+  // 子表编辑API
+  apiUpdate: {
+    type: Function,
+    required: false,
+    default: null
+  },
+  // 子表分页列表API
+  apiPage: {
+    type: Function,
+    required: false,
+    default: null
+  },
+  // 子表删除API
+  apiDelete: {
+    type: Function,
+    required: false,
+    default: null
+  },
+  // 子表新增修改校验
+  detailValidate: {
+    type: Function,
+    required: false,
+    default: null
+  },
+  // 来源 countPlan盘点计划进入
+  fromeWhere: {
+    type: String,
+    required: false,
+    default: ''
+  },
+  // 获取接口列表集合
+  allList: {
+    type: Object,
+    required: true,
+    default: null
+  },
+  // 盘点范围类型
+  countScopeType: {
+    type: Array,
+    required: false,
+    default: null
+  },
+  //盘点详情子表新增的时候判断盘点范围值显示输入框还是下拉框
+  formTypeDetail: {
+    type: String,
+    required: false,
+    default: 'InputString'
+  },
+  //盘点详情子表新增的时候判断盘点范围值的下拉列表
+  countPlanAllList: {
+    type: Array,
+    required: false,
+    default: null
+  },
+  // 详情列表扩展操作按钮
+  buttondataTable: {
+    type: Array,
+    required: false,
+    default: ()=>{
+      return []
+    }
+  },
+  // 针对基础数据tabs扩展 显示table列表 默认false
+  tabsExtend: {
+    type: Boolean,
+    required: false,
+    default: false
+  },
+  // tableObject 数据过滤条件 针对 详情扩展标签页 传入不同条件
+  tableObjectExtend: {
+    type: Array,
+    required: false,
+    default: null
+  },
+  // 子列表 筛选 展示与隐藏 ，默认展示
+  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
+  }
+})
+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 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
+  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
+    }
+    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
+  }
+}
+
+// 获得表格的各种操作
+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)
+  } else {
+    emit('tableFormButton',val, row)
+  }
+}
+/** 添加/修改操作 */
+const openForm = async (type: string, row?: number) => {
+  formRef.value.open(type, row, masterParmas.value)
+  emit('detailOpenForm', type, row)
+}
+// form 提交
+const submitForm = async (formType, data) => {
+  try {
+    // 子表新增编辑校验 如果业务需要子表提交校验 需在主页详情组件添加 detailValidate 参数及方法
+    const rs = (await props.detailValidate) ? await props.detailValidate(data) : true
+    if (!rs) return
+    if (formType === 'create') {
+      await props.apiCreate(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await props.apiUpdate(data)
+      message.success(t('common.updateSuccess'))
+    }
+    formRef.value.dialogVisible = false
+    // 刷新当前列表
+    await getList()
+    updateKey.value += 1
+  } finally {
+    formRef.value.formLoading = false
+  }
+}
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef) => {
+  emit('searchTableSuccessDetail', formField, searchField, val, formRef)
+}
+// 传递给父类
+const emit = defineEmits([
+  'searchTableSuccessDetail',
+  'changeTabs',
+  'selectChangeDetail',
+  'detailOpenForm',
+  'tableFormButton',
+  'openImage',
+  '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)
+}
+
+/**
+ * 监听失焦事件
+ * @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/mes/orderDay/index.vue b/src/views/mes/orderDay/index.vue
index 4ed4babe6..f22c2a46c 100644
--- a/src/views/mes/orderDay/index.vue
+++ b/src/views/mes/orderDay/index.vue
@@ -92,7 +92,7 @@ const tableColumns = ref(OrderDay.allSchemas.tableColumns)
 const  lineOptions=ref([])
 const  processRouteOptions=ref([])
 const bomOptions=ref([])
-//**获取 工序信息 */
+//**获取 产品工艺路由列表 */
 const getProcessroutes = async (code: String) => {
   processRouteOptions.value = await OrderDayApi.getProcessroutes(code)
   OrderDay.allSchemas.formSchema.forEach(item => {
@@ -102,6 +102,7 @@ const getProcessroutes = async (code: String) => {
       }
     })
 }
+//**获取 车间产线列表 */
 const getProductlines = async (code: String) => {
   lineOptions.value = await OrderDayApi.getProductlines(code)
   OrderDay.allSchemas.formSchema.forEach(item => {
diff --git a/src/views/mes/orderDay/orderDay.data.ts b/src/views/mes/orderDay/orderDay.data.ts
index ddaf2c82a..1f9cd3889 100644
--- a/src/views/mes/orderDay/orderDay.data.ts
+++ b/src/views/mes/orderDay/orderDay.data.ts
@@ -305,7 +305,7 @@ export const OrderDay = useCrudSchemas(reactive<CrudSchema[]>([
     label: '创建者',
     field: 'creator',
     sort: 'custom',
-    isSearch: true,
+    isSearch: false,
     isForm: false,
   },
   {

From 58294a63c3ae0570d9511781d04544c272194d1f Mon Sep 17 00:00:00 2001
From: zhousq <zhoushaoqiang@sina.com>
Date: Thu, 28 Mar 2024 08:22:56 +0800
Subject: [PATCH 3/8] =?UTF-8?q?2024-3-28=20=E5=A2=9E=E5=8A=A0searchtable?=
 =?UTF-8?q?=E7=9A=84open=E5=8F=82=E6=95=B0=EF=BC=8C=E6=8E=A7=E5=88=B6?=
 =?UTF-8?q?=E7=AD=9B=E9=80=89=E6=8C=89=E9=92=AE=E7=9A=84=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E9=9A=90=E8=97=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/SearchTable/src/SearchTable.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/SearchTable/src/SearchTable.vue b/src/components/SearchTable/src/SearchTable.vue
index aaaabe0ad..d3f963134 100644
--- a/src/components/SearchTable/src/SearchTable.vue
+++ b/src/components/SearchTable/src/SearchTable.vue
@@ -74,7 +74,7 @@ const typeRef = ref()
 const rowRef = ref()
 const allSchemasRef = ref()
 const multipleBol = ref(false)
-
+//isSearchFilterButtonHide 增加筛选按钮显示隐藏 控制
 const searchConditionRef = ref()
 const open = (titleName: any, allSchemas: any,getApiPage: any, formField: any, searchField: any,multiple: any, type: any, row: any, searchCondition:any , isCountRequestRe:any,isSearchFilterButtonHide:any ) => {
   filterButtonOptions.value.hide=isSearchFilterButtonHide?isSearchFilterButtonHide:false

From e841037f5e6bd0af239eee1b54be7b6cd7627a86 Mon Sep 17 00:00:00 2001
From: zhousq <zhoushaoqiang@sina.com>
Date: Thu, 28 Mar 2024 08:36:00 +0800
Subject: [PATCH 4/8] =?UTF-8?q?2024-3-28=20=E5=B0=91=E9=80=97=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/dict.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/utils/dict.ts b/src/utils/dict.ts
index 237ab67ab..67ad62537 100644
--- a/src/utils/dict.ts
+++ b/src/utils/dict.ts
@@ -280,7 +280,7 @@ export enum DICT_TYPE {
   MESDO_STATUS= 'mes_do_status', // 工单执行状态
   MES_WORKBILL_MODEL='mes_workbill_model',// 工单模式 单工单（根据产品数量生成多个工单）、批量工单（一个产品一个工单）
   MES_TASK_MODE='mes_task_mode', //生产模式 派工方式、领工方式
-  MES_PLANDO_STATUS='mes_plando_status' //计划执行状态
+  MES_PLANDO_STATUS='mes_plando_status', //计划执行状态
   PLAN_PRODUCTION_TYPE = "plan_production_type", // 生产计划类型
   DELIVER_TYPE="deliver_type",//发货类型
   BILL_TYPE="bill_type", // 发票类型

From 1b7db2150a50c1920d4d4483caf73e24f4e47cd9 Mon Sep 17 00:00:00 2001
From: bjang03 <wenwu901@icloud.com>
Date: Thu, 28 Mar 2024 08:49:39 +0800
Subject: [PATCH 5/8] =?UTF-8?q?1=E3=80=81=E5=B7=A5=E4=BD=8D=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E9=A1=B5=E9=9D=A2=E5=85=B3=E8=81=94=E5=BC=B9=E7=AA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/mes/workstation/index.ts              | 156 +++++++++++++-
 src/utils/dict.ts                             |   2 +-
 src/views/mes/workstation/index.vue           | 190 +++++++++++++++---
 src/views/mes/workstation/workstation.data.ts | 163 ++++++++++++++-
 4 files changed, 478 insertions(+), 33 deletions(-)

diff --git a/src/api/mes/workstation/index.ts b/src/api/mes/workstation/index.ts
index 1e8e44a8f..37694b15d 100644
--- a/src/api/mes/workstation/index.ts
+++ b/src/api/mes/workstation/index.ts
@@ -6,7 +6,9 @@ export interface WorkstationVO {
   expireTime: Date
   name: string
 }
-
+export const goalParams = {
+  workstationCode:null
+}
 // 查询工位列表
 export const getWorkstationPage = async (params) => {
   if (params.isSearch) {
@@ -46,4 +48,154 @@ export const exportWorkstation = async (params) => {
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/mes/workstation/get-import-template' })
-}
\ No newline at end of file
+}// 查询班组列表
+export const getTeamPage = async (params) => {
+  console.log(goalParams.workstationCode)
+  params.workstationCode = goalParams.workstationCode
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/mes/team/senior', data })
+  } else {
+    return await request.get({ url: `/mes/team/pageListByWorkstationCode`, params })
+  }
+}
+// 查询选择班组列表
+export const checkTeamPageList = async (params) => {
+  console.log(goalParams.workstationCode)
+  params.workstationCode = goalParams.workstationCode
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/mes/team/senior', data })
+  } else {
+    return await request.get({ url: `/mes/team/pageCheckListByWorkstationCode`, params })
+  }
+}
+// 添加班组关联
+export const createTeamRelation = async (workstationCode,teamCodes:string[]) => {
+  const data = {
+    workstationCode : workstationCode,
+    teamCodes : teamCodes
+  }
+  return await request.post({ url: `/mes/team/createRelation`, data })
+}
+
+// 删除班组关联
+export const deleteTeamRelation = async (workstationCode,teamCodes:string[]) => {
+  const data = {
+    workstationCode : workstationCode,
+    teamCodes : teamCodes
+  }
+  return await request.post({ url: `/mes/team/deleteRelation`, data })
+}
+export const getEquipmentPage = async (params) => {
+  console.log(goalParams.workstationCode)
+  params.workstationCode = goalParams.workstationCode
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/mes/equipment/senior', data })
+  } else {
+    return await request.get({ url: `/mes/equipment/pageListByWorkstationCode`, params })
+  }
+}
+// 查询选择设备列表
+export const checkEquipmentPageList = async (params) => {
+  console.log(goalParams.workstationCode)
+  params.workstationCode = goalParams.workstationCode
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/mes/equipment/senior', data })
+  } else {
+    return await request.get({ url: `/mes/equipment/pageCheckListByWorkstationCode`, params })
+  }
+}
+// 添加设备关联
+export const createEquipmentRelation = async (workstationCode,equipmentCodes:string[]) => {
+  const data = {
+    workstationCode : workstationCode,
+    equipmentCodes : equipmentCodes
+  }
+  return await request.post({ url: `/mes/team/createRelation`, data })
+}
+
+// 删除设备关联
+export const deleteEquipmentRelation = async (workstationCode,equipmentCodes:string[]) => {
+  const data = {
+    workstationCode : workstationCode,
+    equipmentCodes : equipmentCodes
+  }
+  return await request.post({ url: `/mes/team/deleteRelation`, data })
+}
+export const getProcessPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/mes/production-process/senior', data })
+  } else {
+    return await request.get({ url: `/mes/production-process/pageListByWorkstationCode`, params })
+  }
+}
+export const checkProcessPageList = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/mes/production-process/senior', data })
+  } else {
+    return await request.get({ url: `/mes/production-process/pageCheckListByWorkstationCode`, params })
+  }
+}
+// 添加工序关联
+export const createProcessRelation = async (workstationCode,processCodes:string[]) => {
+  const data = {
+    workstationCode : workstationCode,
+    processCodes : processCodes
+  }
+  return await request.post({ url: `/mes/production-process/createRelation`, data })
+}
+
+// 删除工序关联
+export const deleteProcessRelation = async (workstationCode,processCodes:string[]) => {
+  const data = {
+    workstationCode : workstationCode,
+    processCodes : processCodes
+  }
+  return await request.post({ url: `/mes/production-process/deleteRelation`, data })
+}
+export const getProductionPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/mes/production-process/senior', data })
+  } else {
+    return await request.get({ url: `/mes/production-process/pageListByWorkstationCode`, params })
+  }
+}
+export const checkProductionPageList = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/mes/production-process/senior', data })
+  } else {
+    return await request.get({ url: `/mes/production-process/pageCheckListByWorkstationCode`, params })
+  }
+}
+// 添加产品关联
+export const createProductionRelation = async (workstationCode,productionCodes:string[]) => {
+  const data = {
+    workstationCode : workstationCode,
+    productionCodes : productionCodes
+  }
+  return await request.post({ url: `/mes/production-process/createRelation`, data })
+}
+
+// 删除产品关联
+export const deleteProductionRelation = async (workstationCode,productionCodes:string[]) => {
+  const data = {
+    workstationCode : workstationCode,
+    productionCodes : productionCodes
+  }
+  return await request.post({ url: `/mes/production-process/deleteRelation`, data })
+}
diff --git a/src/utils/dict.ts b/src/utils/dict.ts
index 237ab67ab..67ad62537 100644
--- a/src/utils/dict.ts
+++ b/src/utils/dict.ts
@@ -280,7 +280,7 @@ export enum DICT_TYPE {
   MESDO_STATUS= 'mes_do_status', // 工单执行状态
   MES_WORKBILL_MODEL='mes_workbill_model',// 工单模式 单工单（根据产品数量生成多个工单）、批量工单（一个产品一个工单）
   MES_TASK_MODE='mes_task_mode', //生产模式 派工方式、领工方式
-  MES_PLANDO_STATUS='mes_plando_status' //计划执行状态
+  MES_PLANDO_STATUS='mes_plando_status', //计划执行状态
   PLAN_PRODUCTION_TYPE = "plan_production_type", // 生产计划类型
   DELIVER_TYPE="deliver_type",//发货类型
   BILL_TYPE="bill_type", // 发票类型
diff --git a/src/views/mes/workstation/index.vue b/src/views/mes/workstation/index.vue
index 35f6f2dd1..fe96e49f1 100644
--- a/src/views/mes/workstation/index.vue
+++ b/src/views/mes/workstation/index.vue
@@ -4,15 +4,15 @@
     <Search :schema="Workstation.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
   </ContentWrap>
 
-    <!-- 列表头部 -->
-    <TableHead
-      :HeadButttondata="HeadButttondata"
-      @button-base-click="buttonBaseClick"
-      :routeName="routeName"
-      @updataTableColumns="updataTableColumns"
-      @searchFormClick="searchFormClick"
-      :allSchemas="Workstation.allSchemas"
-    />
+  <!-- 列表头部 -->
+  <TableHead
+    :HeadButttondata="HeadButttondata"
+    @button-base-click="buttonBaseClick"
+    :routeName="routeName"
+    @updataTableColumns="updataTableColumns"
+    @searchFormClick="searchFormClick"
+    :allSchemas="Workstation.allSchemas"
+  />
 
   <!-- 列表 -->
   <ContentWrap>
@@ -51,26 +51,90 @@
   />
 
   <!-- 详情 -->
-  <Detail ref="detailRef" :isBasic="true" :allSchemas="Workstation.allSchemas" />
-
+  <Detail ref="detailRef"
+          :isBasic="false"
+          :allSchemas="Workstation.allSchemas"
+          :detailAllSchemas="detailAllSchemas"
+          :detailAllSchemasRules="WorkstationRules"
+          :apiPage="apiPage"
+          :tabs="TabsList"
+          @changeTabs="changeTabs"
+          :buttondataTable="buttondataTable"
+          @tableFormButton="tableFormButton"
+  />
+  <!-- 记录子包装弹窗 -->
+  <BasicForm
+    ref="teamRef"
+    @success="getList"
+    :tableAllSchemas="Team.allSchemas"
+    :tableData="selectTeamListTableData.tableList"
+    :isBusiness="true"
+    :isShowButton="false"
+    :isShowReduceButton="false"
+    :isShowFooterButtton="false"
+  />
+  <BasicForm
+    ref="equipmentListRef"
+    @success="getList"
+    :tableAllSchemas="Equipment.allSchemas"
+    :tableData="selectEquipmentListTableData.tableList"
+    :isBusiness="true"
+    :isShowButton="false"
+    :isShowReduceButton="false"
+    :isShowFooterButtton="false"
+  />
+  <BasicForm
+    ref="processListRef"
+    @success="getList"
+    :tableAllSchemas="Process.allSchemas"
+    :tableData="selectProcessListTableData.tableList"
+    :isBusiness="true"
+    :isShowButton="false"
+    :isShowReduceButton="false"
+    :isShowFooterButtton="false"
+  />
+  <BasicForm
+    ref="productionListRef"
+    @success="getList"
+    :tableAllSchemas="Production.allSchemas"
+    :tableData="selectProductionListTableData.tableList"
+    :isBusiness="true"
+    :isShowButton="false"
+    :isShowReduceButton="false"
+    :isShowFooterButtton="false"
+  />
   <!-- 导入 -->
   <ImportForm ref="importFormRef" url="/mes/workstation/import" :importTemplateData="importTemplateData" @success="importSuccess" />
 </template>
 
 <script setup lang="ts">
 import download from '@/utils/download'
-import { Workstation,WorkstationRules } from './workstation.data'
+import {
+  Equipment,
+  Process,
+  Production,
+  TabsList,
+  Team,
+  Workstation,
+  WorkstationRules
+} from './workstation.data'
 import * as WorkstationApi from '@/api/mes/workstation'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
 import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
-import Detail from '@/components/Detail/src/Detail.vue'
-
+import {
+  checkEquipmentPageList, checkProcessPageList, checkProductionPageList,
+  checkTeamPageList,
+  getEquipmentPage, getProcessPage, getProductionPage, getSelectEquipmentPage,
+  getSelectTeamPage,
+  goalParams,
+} from "@/api/mes/workstation";
+import * as PurchasereceiptRecordDetailApi from "@/api/wms/purchasereceiptRecordDetail";
 defineOptions({ name: 'Workstation' })
 
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
-
+const teamRef = ref()
 const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
@@ -135,7 +199,6 @@ const buttonBaseClick = (val, item) => {
 const butttondata = [
   defaultButtons.mainListEditBtn({hasPermi:'wms:workstation:update'}), // 编辑
   defaultButtons.mainListDeleteBtn({hasPermi:'wms:workstation:delete'}), // 删除
-  defaultButtons.mainListBindBtn({hasPermi:'wms:workstation:update'}), // 绑定
 ]
 
 // 列表-操作按钮事件
@@ -144,11 +207,8 @@ const buttonTableClick = async (val, row) => {
     openForm('update', row)
   } else if (val == 'delete') { // 删除
     await handleDelete(row.id)
-  }else if (val == 'bind') { // 删除
-    await detailRef.value.openDetail(row, '绑定', row.name, 'mesWorkstation')
   }
 }
-
 /** 添加/修改操作 */
 const basicFormRef = ref()
 const openForm = (type: string, row?: any) => {
@@ -179,11 +239,6 @@ const formsSuccess = async (formType,data) => {
   getList()
 }
 
-/** 详情操作 */
-const detailRef = ref()
-const openDetail = (row: any, titleName: any, titleValue: any) => {
-  detailRef.value.openDetail(row, titleName, titleValue, 'basicWorkstation')
-}
 
 /** 删除按钮操作 */
 const handleDelete = async (id: number) => {
@@ -243,5 +298,92 @@ onMounted(async () => {
   getList()
   importTemplateData.templateUrl = await WorkstationApi.importTemplate()
 })
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  goalParams.workstationCode = row.code
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicWorkstation')
+}
+// 子包装数据
+const detailAllSchemas = ref(Team.allSchemas)
+const apiPage = ref(WorkstationApi.getTeamPage)
+const tableKey = ref("workstationDetail");
+// tabs 切换事件
+const changeTabs = (data) =>{
+  tableKey.value = data.prop
+  if(data.prop == 'Team'){
+    apiPage.value = WorkstationApi.getTeamPage
+    detailAllSchemas.value = Team.allSchemas
+  }else if(data.prop == 'Equipment'){
+    apiPage.value = WorkstationApi.getEquipmentPage
+    detailAllSchemas.value = Equipment.allSchemas
+  }else if(data.prop == 'Process'){
+    apiPage.value = WorkstationApi.getProcessPage
+    detailAllSchemas.value = Process.allSchemas
+  }else if(data.prop == 'Production'){
+    apiPage.value = WorkstationApi.getProductionPage
+    detailAllSchemas.value = Production.allSchemas
+  }
+}
+const buttondataTable = ref([{
+  label: '取消关联',
+  name: 'viewParentPickingNumber',
+  hide: false,
+  type: 'primary',
+  icon: '',
+  color: '',
+  hasPermi: '',
+  link: true, // 文本展现按钮
+}])
+const teamListRef = ref()
+const { tableObject: selectTeamListTableData, tableMethods: selectTeamListTableMethods } = useTable({
+  getListApi: WorkstationApi.checkTeamPageList
+})
+const { getList:selectTeamList } = selectTeamListTableMethods
 
+const equipmentListRef = ref()
+const { tableObject: selectEquipmentListTableData, tableMethods: selectEquipmentListTableMethods } = useTable({
+  getListApi: WorkstationApi.checkEquipmentPageList
+})
+const { getList:selectEquipmentList } = selectEquipmentListTableMethods
+
+const processListRef = ref()
+const { tableObject: selectProcessListTableData, tableMethods: processListTableMethods } = useTable({
+  getListApi: WorkstationApi.checkProcessPageList
+})
+const { getList:selectProcessListList } = processListTableMethods
+
+const productionListRef = ref()
+const { tableObject: selectProductionListTableData, tableMethods: productionListTableMethods } = useTable({
+  getListApi: WorkstationApi.checkProductionPageList
+})
+const { getList:selectProductionList } = productionListTableMethods
+
+const tableFormButton = async (val , row) => {
+  if(val == 'Team'){
+    selectTeamListTableData.params = {
+      workstationCode:row.workstationCode
+    }
+    await selectTeamList()
+    teamListRef.value.open('create', row, null,'viewDetail')//查看明细数据
+  }else if(val == 'Equipment'){
+    selectEquipmentListTableData.params = {
+      workstationCode:row.workstationCode
+    }
+    await selectEquipmentList()
+    equipmentListRef.value.open('create', row, null,'viewDetail')//查看明细数据
+  }else if(val == 'Process'){
+    selectProcessListTableData.params = {
+      workstationCode:row.workstationCode
+    }
+    await selectProcessListList()
+    processListRef.value.open('create', row, null,'viewDetail')//查看明细数据
+  }else if(val == 'Production'){
+    selectProductionListTableData.params = {
+      workstationCode:row.workstationCode
+    }
+    await selectProductionList()
+    productionListRef.value.open('create', row, null,'viewDetail')//查看明细数据
+  }
+}
 </script>
diff --git a/src/views/mes/workstation/workstation.data.ts b/src/views/mes/workstation/workstation.data.ts
index 611194817..21d49d7d0 100644
--- a/src/views/mes/workstation/workstation.data.ts
+++ b/src/views/mes/workstation/workstation.data.ts
@@ -1,11 +1,28 @@
-import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter } from '@/utils/formatTime'
+import type {CrudSchema} from '@/hooks/web/useCrudSchemas'
+import {dateFormatter} from '@/utils/formatTime'
 
 // 表单校验
 export const WorkstationRules = reactive({
   code: [required]
 })
+export const TabsList = [{
+  label: "班组",
+  prop: 'Team',
+},
+  {
+    label: "设备",
+    prop: 'Equipment',
+  },
+  {
+    label: "工序",
+    prop: 'Process',
+  },
+  {
+    label: "产品",
+    prop: 'Production',
+  }
 
+]
 export const Workstation = useCrudSchemas(reactive<CrudSchema[]>([
 
   {
@@ -46,26 +63,36 @@ export const Workstation = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'activeTime',
     sort: 'custom',
     formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
     form: {
       component: 'DatePicker',
       componentProps: {
+        style: {width: '100%'},
         type: 'datetime',
-        valueFormat: 'x'
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
       }
-    }
+    },
   },
   {
     label: '失效时间',
     field: 'expireTime',
     sort: 'custom',
     formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
     form: {
       component: 'DatePicker',
       componentProps: {
+        style: {width: '100%'},
         type: 'datetime',
-        valueFormat: 'x'
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
       }
-    }
+    },
   },
   {
     label: '操作',
@@ -77,3 +104,127 @@ export const Workstation = useCrudSchemas(reactive<CrudSchema[]>([
     }
   }
 ]))
+export const Team = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '代码',
+    field: 'code',
+    sort: 'custom',
+    isSearch: true,
+    isForm: false
+  },
+  {
+    label: '名称',
+    field: 'name',
+    sort: 'custom',
+    isSearch: true,
+    isForm: false
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 150,
+      fixed: 'right'
+    },
+    isTableForm:true,
+  }
+]))
+export const TeamSelect = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '代码',
+    field: 'code',
+    sort: 'custom',
+    isSearch: true,
+    isForm: false
+  },
+  {
+    label: '名称',
+    field: 'name',
+    sort: 'custom',
+    isSearch: true,
+    isForm: false
+  }
+]))
+export const Equipment = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '代码',
+    field: 'code',
+    sort: 'custom',
+    isSearch: true,
+    isForm: false
+  },
+  {
+    label: '名称',
+    field: 'name',
+    sort: 'custom',
+    isSearch: true,
+    isForm: false
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 150,
+      fixed: 'right'
+    },
+    isTableForm:true,
+  }
+]))
+export const Process = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '代码',
+    field: 'code',
+    sort: 'custom',
+    isSearch: true,
+    isForm: false
+  },
+  {
+    label: '名称',
+    field: 'name',
+    sort: 'custom',
+    isSearch: true,
+    isForm: false
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 150,
+      fixed: 'right'
+    },
+    isTableForm:true,
+  }
+]))
+export const Production = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '代码',
+    field: 'code',
+    sort: 'custom',
+    isSearch: true,
+    isForm: false
+  },
+  {
+    label: '名称',
+    field: 'name',
+    sort: 'custom',
+    isSearch: true,
+    isForm: false
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 150,
+      fixed: 'right'
+    },
+    isTableForm:true,
+  }
+]))

From 7cd0aa00f46b75267194f784aa8609e60e27290d Mon Sep 17 00:00:00 2001
From: chenfang <chenfang@chenrise.com>
Date: Thu, 28 Mar 2024 10:02:55 +0800
Subject: [PATCH 6/8] =?UTF-8?q?=E7=89=A9=E6=96=99=E5=BA=93=E5=8C=BA?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=8C=85=E8=A3=85=E8=A7=84=E6=A0=BC=E6=94=B9?=
 =?UTF-8?q?=EF=BC=9A=E7=89=A9=E6=96=99=E5=8C=85=E8=A3=85=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=EF=BC=8C=E5=8C=85=E8=A3=85=E8=A7=84=E6=A0=BC=E9=9A=90=E8=97=8F?=
 =?UTF-8?q?=E7=88=B6=E5=8C=85=E8=A3=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../itemManage/itemarea/itemarea.data.ts      | 36 ++++----
 .../packageunit/packageunit.data.ts           | 86 +++++++++----------
 2 files changed, 64 insertions(+), 58 deletions(-)

diff --git a/src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts b/src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts
index 43e97c5fd..58b11628f 100644
--- a/src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts
@@ -7,14 +7,12 @@ import { Itembasic } from '../itembasic/itembasic.data'
 import * as AreaApi from '@/api/wms/areabasic'
 import { Area } from '../../factoryModeling/areabasic/areabasic.data'
 
-import * as LocationgroupApi from '@/api/wms/locationgroup'
-import { Locationgroup } from '../../factoryModeling/locationgroup/locationgroup.data'
-
 import * as LocationApi from '@/api/wms/location'
 import { Location } from '../../factoryModeling/location/location.data'
 
-import * as PackageunitApi from '@/api/wms/packageunit'
-import { Packageunit } from '../packageunit/packageunit.data'
+import * as ItempackageApi from '@/api/wms/itempackage'
+import { Itempackaging } from '../itempackage/itempackage.data'
+import { t } from '@/hooks/web/useI18n'
 
 export const Itemarea = useCrudSchemas(reactive<CrudSchema[]>([
   {
@@ -97,15 +95,19 @@ export const Itemarea = useCrudSchemas(reactive<CrudSchema[]>([
       // labelMessage: '信息提示说明！！！',
       componentProps: {
         isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择包装规格代码', // 输入框占位文本
+        searchListPlaceholder: '请选择物料包装代码', // 输入框占位文本
         searchField: 'code', // 查询弹窗赋值字段
-        searchTitle: '包装规格基础信息', // 查询弹窗标题
-        searchAllSchemas: Packageunit.allSchemas, // 查询弹窗所需类
-        searchPage: PackageunitApi.getPackageunitPage, // 查询弹窗所需分页方法
+        searchTitle: '物料包装信息', // 查询弹窗标题
+        searchAllSchemas: Itempackaging.allSchemas, // 查询弹窗所需类
+        searchPage: ItempackageApi.getItempackagingPage, // 查询弹窗所需分页方法
         searchCondition: [{
           key: 'available',
           value: 'TRUE',
-          isMainValue: false
+        },{
+          key: 'itemCode',
+          value: 'itemCode',
+          message: "请选择物料代码",
+          isMainValue: true
         }]
       }
     }
@@ -122,15 +124,19 @@ export const Itemarea = useCrudSchemas(reactive<CrudSchema[]>([
       // labelMessage: '信息提示说明！！！',
       componentProps: {
         isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择包装规格代码', // 输入框占位文本
+        searchListPlaceholder: '请选择物料包装代码', // 输入框占位文本
         searchField: 'code', // 查询弹窗赋值字段
-        searchTitle: '包装规格基础信息', // 查询弹窗标题
-        searchAllSchemas: Packageunit.allSchemas, // 查询弹窗所需类
-        searchPage: PackageunitApi.getPackageunitPage, // 查询弹窗所需分页方法
+        searchTitle: '物料包装信息', // 查询弹窗标题
+        searchAllSchemas: Itempackaging.allSchemas, // 查询弹窗所需类
+        searchPage: ItempackageApi.getItempackagingPage, // 查询弹窗所需分页方法
         searchCondition: [{
           key: 'available',
           value: 'TRUE',
-          isMainValue: false
+        },{
+          key: 'itemCode',
+          value: 'itemCode',
+          message: "请选择物料代码",
+          isMainValue: true
         }]
       }
     }
diff --git a/src/views/wms/basicDataManage/itemManage/packageunit/packageunit.data.ts b/src/views/wms/basicDataManage/itemManage/packageunit/packageunit.data.ts
index 6e3fd6394..25079eb5d 100644
--- a/src/views/wms/basicDataManage/itemManage/packageunit/packageunit.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/packageunit/packageunit.data.ts
@@ -3,7 +3,7 @@ import { dateFormatter } from '@/utils/formatTime'
 import { fa } from 'element-plus/es/locale'
 import * as PackageunitApi from '@/api/wms/packageunit'
 
-export const PackageunitCopy = useCrudSchemas(reactive<CrudSchema[]>([
+export const Packageunit = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '包装代码',
     field: 'code',
@@ -13,14 +13,29 @@ export const PackageunitCopy = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
-  {
-    label: '父包装代码',
-    field: 'parentCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    }
-  },
+  // {
+  //   label: '父包装代码',
+  //   field: 'parentCode',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   form: {
+  //     componentProps: {
+  //       isSearchList: true,
+  //       searchListPlaceholder: '请选择父包装代码',
+  //       searchField: 'code',
+  //       searchTitle: '包装规格信息',
+  //       searchAllSchemas: PackageunitCopy.allSchemas,
+  //       searchPage: PackageunitApi.getPackageunitPage,
+  //       searchCondition: [{
+  //         key: 'available',
+  //         value: 'TRUE',
+  //         isMainValue: false
+  //       }]
+  //     }
+  //   }
+  // },
   {
     label: '包装名称',
     field: 'name',
@@ -270,7 +285,25 @@ export const PackageunitCopy = useCrudSchemas(reactive<CrudSchema[]>([
   }
 ]))
 
-export const Packageunit = useCrudSchemas(reactive<CrudSchema[]>([
+// 表单校验
+export const PackageunitRules = reactive({
+  code: [
+    { required: true, message: '请输入包装代码', trigger: 'change' }
+  ],
+  name: [
+    { required: true, message: '请输入包装名称', trigger: 'change' }
+  ],
+  type: [
+    { required: true, message: '请选择包装类型', trigger: 'change' }
+  ],
+  desc: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' },
+    { required: true, message: '请输入包装描述', trigger: 'change' }
+  ],
+})
+
+//已取消  保留只是为了预防日后使用
+export const PackageunitCopy = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '包装代码',
     field: 'code',
@@ -286,21 +319,6 @@ export const Packageunit = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     table: {
       width: 150
-    },
-    form: {
-      componentProps: {
-        isSearchList: true,
-        searchListPlaceholder: '请选择父包装代码',
-        searchField: 'code',
-        searchTitle: '包装规格信息',
-        searchAllSchemas: PackageunitCopy.allSchemas,
-        searchPage: PackageunitApi.getPackageunitPage,
-        searchCondition: [{
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        }]
-      }
     }
   },
   {
@@ -551,21 +569,3 @@ export const Packageunit = useCrudSchemas(reactive<CrudSchema[]>([
     }
   }
 ]))
-
-// 表单校验
-export const PackageunitRules = reactive({
-  code: [
-    { required: true, message: '请输入包装代码', trigger: 'change' }
-  ],
-  name: [
-    { required: true, message: '请输入包装名称', trigger: 'change' }
-  ],
-  type: [
-    { required: true, message: '请选择包装类型', trigger: 'change' }
-  ],
-  desc: [
-    { max: 50, message: '不得超过50个字符', trigger: 'blur' },
-    { required: true, message: '请输入包装描述', trigger: 'change' }
-  ],
-})
-

From 55e6be62ae46feac8164b9955b9cd5800b087112 Mon Sep 17 00:00:00 2001
From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com>
Date: Thu, 28 Mar 2024 10:15:07 +0800
Subject: [PATCH 7/8] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E6=94=B9=E5=A4=87?=
 =?UTF-8?q?=E6=B3=A8=EF=BC=8C=E9=99=84=E4=BB=B6=EF=BC=8C=E5=8F=98=E6=9B=B4?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E4=BD=8D=E7=BD=AE=202=E3=80=81=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E6=A1=86=E7=A7=BB=E5=8A=A8=E8=8F=9C=E5=8D=95=E6=A0=8F?=
 =?UTF-8?q?=EF=BC=88=E9=9A=90=E8=97=8F=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Annex/src/Annex.vue            | 13 ++++-----
 .../ChangeRecord/src/ChangeRecord.vue         |  9 ++++---
 .../Descriptions/src/Descriptions.vue         | 14 +++++-----
 src/components/Detail/src/Detail.vue          | 27 ++++++++++++++-----
 src/components/Remarks/src/Remarks.vue        | 22 +++++++--------
 src/layout/components/useRenderLayout.tsx     | 17 +++++++++++-
 6 files changed, 66 insertions(+), 36 deletions(-)

diff --git a/src/components/Annex/src/Annex.vue b/src/components/Annex/src/Annex.vue
index 4cae5c2e1..b61fd7ea5 100644
--- a/src/components/Annex/src/Annex.vue
+++ b/src/components/Annex/src/Annex.vue
@@ -2,14 +2,15 @@
 <template>
   <div class="annex">
     <div class="title flex items-center">
-      <div class="title-txt">附件</div>
-      <UploadFile :isShowFile="false" :isShowTip="false" title="添加附件" :upData="upData"
-        @update:modelValue="handleAnnexSuccess" />
+      <!-- <div class="title-txt">附件</div> -->
+      <UploadFile
+        :isShowFile="false" :isShowTip="false" title="添加附件" :upData="upData"
+        @update:model-value="handleAnnexSuccess" />
     </div>
     <div class="list">
       <div class="item flex items-start" v-for="(item, index) in annexData.annexList" :key="index">
         <Icon icon="fa:file-text-o" color="#409eff" size="30" class="mt-4px" />
-        <div class="item-center" >
+        <div class="item-center">
           <div class="item-title" @click="downFile(item)">{{ item.name }}</div>
           <div class="info mt-6px">
             <div class="info-txt">
@@ -18,7 +19,7 @@
             </div>
             <Icon icon="ep:delete" class="cursor-pointer" size="18" @click="deleteAnnex(item.id)" />
           </div>
-          <div class="time mt-6px ">{{ formatDate(item.createTime) }}</div>
+          <div class="time mt-6px">{{ formatDate(item.createTime) }}</div>
         </div>
       </div>
     </div>
@@ -72,7 +73,7 @@ const downFile = (item)=>{
 <style scoped lang="scss">
 .title {
   border-bottom: 1px solid #dedede;
-  justify-content: space-between;
+  justify-content: flex-end;
 
   .title-txt {
     width: 80px;
diff --git a/src/components/ChangeRecord/src/ChangeRecord.vue b/src/components/ChangeRecord/src/ChangeRecord.vue
index a7de4f902..b68b7c8a8 100644
--- a/src/components/ChangeRecord/src/ChangeRecord.vue
+++ b/src/components/ChangeRecord/src/ChangeRecord.vue
@@ -1,22 +1,23 @@
 <!-- 变更记录组件 -->
 <template>
   <div class="annex">
-    <div class="title flex items-center">
+    <!-- <div class="title flex items-center">
       <div class="title-txt">变更记录</div>
-    </div>
+    </div> -->
     <div class="list">
       <el-steps direction="vertical" class="mt-16px" :space="90">
         <el-step v-for="(item, index) in changeRecordData.changeRecordList" :key="index">
           <template #icon>
             <slot>
-              <Icon color="#9e9e9e"
+              <Icon
+                color="#9e9e9e"
                 :icon="item.type == 1 ? 'ep:document-add' : item.type == 2 ? 'ep:edit' : item.type == 3 ? 'ep:delete' : item.type == 4 ? 'fa:edit' : item.type == 5 ? 'ep:upload' : item.type == 6 ? 'ep:document-delete' : item.type == 7 ? 'ep:chat-line-square' : item.type == 8 ? 'ep:delete' : ''"
                 class="cursor-pointer" size="20" />
             </slot>
           </template>
           <template #title>
             <slot>
-              <span class="color-#9e9e9e font-size-16px time">{{ formatDate(item.createTime) }}</span>
+              <span class="time font-size-16px color-#9e9e9e">{{ formatDate(item.createTime) }}</span>
             </slot>
           </template>
           <template #description>
diff --git a/src/components/Descriptions/src/Descriptions.vue b/src/components/Descriptions/src/Descriptions.vue
index 56540d68b..c154c8014 100644
--- a/src/components/Descriptions/src/Descriptions.vue
+++ b/src/components/Descriptions/src/Descriptions.vue
@@ -108,7 +108,7 @@ const showAll = () =>{
       <Icon v-if="collapse" :icon="show ? 'ep:arrow-down' : 'ep:arrow-up'" />
     </div>
 
-    <ElCollapseTransition  :style="{height: height,overflow: 'hidden'}">
+    <ElCollapseTransition :style="{height: height,overflow: 'hidden'}">
       <div v-show="show" :class="[`${prefixCls}-content`]">
         <ElDescriptions
           :column="props.columns"
@@ -133,7 +133,7 @@ const showAll = () =>{
                 :row="{
                   label: item.label
                 }"
-                >{{ item.label }}
+              >{{ item.label }}
               </slot>
             </template>
 
@@ -144,10 +144,10 @@ const showAll = () =>{
                 }}
               </slot>
               <slot v-else-if="item.dictType">
-                <div v-if="data[item.field]&&Array.isArray(data[item.field])" >
-                  <DictTag :type="item.dictType" :value="cur" v-for="(cur,key) in data[item.field]" :key="key" style="margin-right: 6px;margin-bottom: 6px;"/>
+                <div v-if="data[item.field]&&Array.isArray(data[item.field])">
+                  <DictTag :type="item.dictType" :value="cur" v-for="(cur,key) in data[item.field]" :key="key" style="margin-right: 6px;margin-bottom: 6px;" />
                 </div>
-                <DictTag :type="item.dictType" :value="data[item.field] + ''" v-if="data[item.field]&&!Array.isArray(data[item.field])"/>
+                <DictTag :type="item.dictType" :value="data[item.field] + ''" v-if="data[item.field]&&!Array.isArray(data[item.field])" />
               </slot>
               <slot v-else :name="item.field" :row="data">{{ data[item.field] }}</slot>
             </template>
@@ -155,8 +155,8 @@ const showAll = () =>{
         </ElDescriptions>
       </div>
     </ElCollapseTransition>
-    <div class="flex align-center  justify-center">
-      <el-button type="primary" class="mt-20px" @click="showAll">{{!isShow?'展开':'收起'}}</el-button>
+    <div class="align-center flex justify-center">
+      <el-button type="primary" class="mt-20px" @click="showAll">{{ !isShow?'展开':'收起' }}</el-button>
     </div>
   </div>
 </template>
diff --git a/src/components/Detail/src/Detail.vue b/src/components/Detail/src/Detail.vue
index 899d5fc31..21713690e 100644
--- a/src/components/Detail/src/Detail.vue
+++ b/src/components/Detail/src/Detail.vue
@@ -28,7 +28,7 @@
       <Tabs :tabsList="tabsList" :current="current" @change="change" />
       <div class="flex">
         <!-- 详情 -->
-        <ContentWrap class="w-[73%]">
+        <ContentWrap class="w-[100%]" v-show="current<tabsList.length-3">
           <!-- 列表头部 -->
           <TableHead
             v-if="!isBasic"
@@ -72,8 +72,8 @@
             v-model:pageSize="tableObjectRef.pageSize"
             v-model:currentPage="tableObjectRef.currentPage"
           >
-          <template #photos="{ row }">
-             <div v-for="(item,index) in row.photos.split(',')" :key="index" style="color:#409eff ; cursor: pointer;" @click="openImage(item)">{{ item }}</div>
+            <template #photos="{ row }">
+              <div v-for="(item,index) in row.photos.split(',')" :key="index" style="color:#409eff ; cursor: pointer;" @click="openImage(item)">{{ item }}</div>
             </template>
             <template #action="{ row }">
               <ButtonBase
@@ -98,9 +98,12 @@
             </template>
           </DetailTable>
         </ContentWrap>
-        <ContentWrap class="w-[27%] ml-16px">
+
+        <!-- 附件/备注/变更记录 -->
+        <ContentWrap class="w-[100%]" v-show="current>=tabsList.length-3">
           <!-- 附件组件 -->
           <Annex
+            v-show="current===tabsList.length-3"
             :annexData="annexData"
             @handleAnnexSuccess="handleAnnexSuccess"
             @deleteAnnexSuccess="deleteAnnexSuccess"
@@ -108,14 +111,16 @@
           />
           <!-- 备注组件 -->
           <Remarks
+            v-show="current===tabsList.length-2"
             :remarksData="remarksData"
             class="mt-20px"
             @remarksSubmitScuess="remarksSubmitScuess"
           />
           <!-- 变更记录组件 -->
-          <ChangeRecord :changeRecordData="changeRecordData" class="mt-20px" />
+          <ChangeRecord v-show="current===tabsList.length-1" :changeRecordData="changeRecordData" class="mt-20px" />
         </ContentWrap>
       </div>
+      
     </el-drawer>
     <!-- 表单弹窗：添加/修改 -->
     <BasicForm
@@ -322,8 +327,16 @@ if (props.isBasic == true) {
     ]
   }
 }
-if (tabsList.value) {
-}
+tabsList.value = [...tabsList?.value,{
+    label:'附件',
+    prop:'Annex'
+  },{
+    label:'备注',
+    prop:'Remarks'
+  },{
+    label:'变更记录',
+    prop:'ChangeRecord'
+  }]
 
 // 附件默认数据
 const annexData = reactive({
diff --git a/src/components/Remarks/src/Remarks.vue b/src/components/Remarks/src/Remarks.vue
index f73c66c8f..351c2b521 100644
--- a/src/components/Remarks/src/Remarks.vue
+++ b/src/components/Remarks/src/Remarks.vue
@@ -1,29 +1,29 @@
 <!-- 备注组件 -->
 <template>
   <div class="annex">
-    <div class="title flex items-center">
+    <!-- <div class="title flex items-center">
       <div class="title-txt">备注</div>
-    </div>
+    </div> -->
     <div class="list">
       <div class="item flex items-start" v-for="(item, index) in remarksData.remarksList" :key="index">
         <div class="user-icon mt-4px">
-          <img :src="item.avatar" v-if="item.avatar" alt="" class="w-[100%] h-[100%]"/>
-          <Icon icon="fa-solid:user" color="#fff" v-else size="16"/>
+          <img :src="item.avatar" v-if="item.avatar" alt="" class="h-[100%] w-[100%]" />
+          <Icon icon="fa-solid:user" color="#fff" v-else size="16" />
         </div>
         <div class="item-center">
           <div class="item-title">
             <div class="item-title-txt">{{ item.nickname }}</div>
-            <div class="time">{{formatDate(item.createTime)}}</div>
+            <div class="time">{{ formatDate(item.createTime) }}</div>
           </div>
-          <div class="mt-8px color-#303133 font-size-14px">{{ item.remark }}</div>
+          <div class="mt-8px font-size-14px color-#303133">{{ item.remark }}</div>
         </div>
       </div>
     </div>
-    <div class="add-remarks flex items-center mt-20px">
-       <el-input v-model="data.remark" placeholder="请输入备注" />
-       <el-button class="ml-16px" type="primary" @click="handleSubmitrRemarks" >
-          确定
-        </el-button>
+    <div class="add-remarks mt-20px flex items-center">
+      <el-input v-model="data.remark" placeholder="请输入备注" />
+      <el-button class="ml-16px" type="primary" @click="handleSubmitrRemarks">
+        确定
+      </el-button>
     </div>
   </div>
 </template>
diff --git a/src/layout/components/useRenderLayout.tsx b/src/layout/components/useRenderLayout.tsx
index 46a1e60eb..c4d2e1096 100644
--- a/src/layout/components/useRenderLayout.tsx
+++ b/src/layout/components/useRenderLayout.tsx
@@ -8,6 +8,7 @@ import AppView from './AppView.vue'
 import ToolHeader from './ToolHeader.vue'
 import { ElScrollbar } from 'element-plus'
 import { useDesign } from '@/hooks/web/useDesign'
+import RouterSearch from '@/components/RouterSearch/index.vue'
 
 const { getPrefixCls } = useDesign()
 
@@ -35,6 +36,9 @@ const mobile = computed(() => appStore.getMobile)
 // 固定菜单
 const fixedMenu = computed(() => appStore.getFixedMenu)
 
+// 搜索图片
+const search = computed(() => appStore.search)
+
 export const useRenderLayout = () => {
   const renderClassic = () => {
     return (
@@ -58,7 +62,18 @@ export const useRenderLayout = () => {
               style="transition: all var(--transition-time-02);"
             ></Logo>
           ) : undefined}
-          <Menu class={[{ '!h-[calc(100%-var(--logo-height))]': logo.value }]}></Menu>
+          {/* {search.value && !appStore.getCollapse? (<div class={[
+          prefixCls,
+          'h-[var(--top-tool-height)] relative px-[var(--top-tool-p-x)] flex items-center justify-between'
+        ]}> <RouterSearch class={[
+          'bg-[var(--left-menu-bg-color)] relative',
+          {
+            '!pl-0': mobile.value && collapse.value,
+            'w-[var(--left-menu-min-width)]': appStore.getCollapse,
+            'w-[var(--left-menu-max-width)]': !appStore.getCollapse
+          }
+        ]} isModal={false} /> </div>) : undefined} */}
+          <Menu class={[{ '!h-[calc(100% - 50px - var(--logo-height)))]': logo.value }]}></Menu>
         </div>
         <div
           class={[

From 2536a93311e766f482793a6f5da0bc6d7843f564 Mon Sep 17 00:00:00 2001
From: chenfang <chenfang@chenrise.com>
Date: Thu, 28 Mar 2024 10:27:13 +0800
Subject: [PATCH 8/8] =?UTF-8?q?=E7=89=A9=E6=96=99=E5=BA=93=E5=8C=BA?=
 =?UTF-8?q?=E9=9A=90=E8=97=8F=E9=83=A8=E5=88=86=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/validator.ts                                     | 2 +-
 .../basicDataManage/itemManage/itemarea/itemarea.data.ts   | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/utils/validator.ts b/src/utils/validator.ts
index 60671f771..cafde51c7 100644
--- a/src/utils/validator.ts
+++ b/src/utils/validator.ts
@@ -729,7 +729,7 @@ function trim(str) {
 //校验只可输入大小写字母及数字
 export function validateYS(rule, value, callback) {
     if (value) {
-        const regs = /^[a-zA-Z0-9-_]+$/
+        const regs = /^[a-zA-Z0-9-_.]+$/
         if(regs.test(value)){
             callback()
         } else {
diff --git a/src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts b/src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts
index 58b11628f..d7a3494ab 100644
--- a/src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts
@@ -383,7 +383,7 @@ export const Itemarea = useCrudSchemas(reactive<CrudSchema[]>([
     dictClass: 'string',
     form: {
       component: 'Switch',
-      value: 'FALSE',
+      value: 'TRUE',
       componentProps: {
         inactiveValue: 'FALSE',
         activeValue: 'TRUE'
@@ -401,7 +401,8 @@ export const Itemarea = useCrudSchemas(reactive<CrudSchema[]>([
       value: 'FALSE',
       componentProps: {
         inactiveValue: 'FALSE',
-        activeValue: 'TRUE'
+        activeValue: 'TRUE',
+        disabled: 'TRUE',
       }
     },
   },
@@ -428,7 +429,7 @@ export const Itemarea = useCrudSchemas(reactive<CrudSchema[]>([
     dictClass: 'string',
     form: {
       component: 'Switch',
-      value: 'TRUE',
+      value: 'FALSE',
       componentProps: {
         inactiveValue: 'FALSE',
         activeValue: 'TRUE'