2024-04-01 几日计划排产及工艺路线图形优化

src/api/mes/orderDay/index.ts

@@ -0,0 +1,102 @@
+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 })
+}
+// 获取产线信息
+export const getProductlineInfo = async (code: String)  => {
+  return request.get({ url: '/mes/common/getLinesByWorkRoomCode?code='+code })
+}
+// 根据工艺路线的工序信息
+export const getProcessroutesDetail = async (code)  => {
+  return await request.get({ url: `/mes/orderday/getProcessInfo?code=`+ code })
+}
+// 根据获取计划BOM信息
+export const getPlanBom = async (params)  => {
+  return await request.get({ url: `/mes/orderday/getBomInfo`,params })
+}
+// 根据计划的车间、产线、计划时间 查询已经配置的人员
+export const getPlanWorks = async (params)  => {
+  return await request.get({ url: `/mes/orderday/getWorkGroup`,params })
+}
+// 根据车间、产线 查询已配置的设备
+export const getPlanDevices = async (params)  => {
+  return await request.get({ url: `/mes/orderday/getDeviceInfo`,params })
+}
+
+///发布计划
+export const publishPlan = async (params)  => {
+  return await request.post({ url: `/mes/orderday/publishPlan`,params })
+}
+//终止计划
+export const stopPlan = async (params)  => {
+  return await request.post({ url: `/mes/orderday/stopPlan`,params })
+}

src/utils/dict.ts

@@ -279,4 +279,10 @@ export enum DICT_TYPE {
   PLAN_PRODUCTION_TYPE = "plan_production_type", // 生产计划类型
   DELIVER_TYPE="deliver_type",//发货类型
   BILL_TYPE="bill_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' //计划执行状
+  
 }

src/views/mes/orderDay/components/BasicFormV2.vue

@@ -0,0 +1,459 @@
+<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'
+
+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 searchFilterButtonHide=ref(props.isSearchFilterButtonHide)
+
+/** 弹层操作 */
+// 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'
+])
+
+/**
+ * 监听改变事件
+ * @param field 当前操作字段
+ * @param cur 改变后值
+ */
+const onChange = (field, cur) => {
+  emit('onChange', field, cur)
+}
+
+/**
+ * 监听失焦事件
+ * @param field 当前操作字段
+ * @param e 
+ */
+const onBlur = (field, e) => {
+  emit('onBlur', field, e)
+}
+</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>

src/views/mes/orderDay/components/orderDetail.vue

@@ -0,0 +1,237 @@
+<template>
+  <div>
+    <el-drawer
+      v-model="isShowDrawer"
+      title="详情"
+      direction="rtl"
+      size="80%"
+      v-loading="detailLoading"
+    >
+      <template #header>
+        <div class="font-size-18px">
+          {{ titleValueRef }} <span class="ml-20px font-size-16px">{{ titleNameRef }}</span>
+        </div>
+      </template>
+      <ContentWrap>
+        <Descriptions
+          :data="detailData"
+          labelClassName="label-class-name"
+          label-align="left"
+          direction="vertical"
+          :column="8"
+          :schema="allSchemas.detailSchema"
+          :columns="2"
+          width="200px"
+        />
+      </ContentWrap>
+
+      <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
+        <el-tab-pane label="工艺路线信息" name="processRouteInfo">
+          <div class="mt-20px">
+            <el-space :size="10" spacer="|">
+              <span>名称：<el-tag v-if="processRouteInfoSchema.processrouteInfo!=null">{{ processRouteInfoSchema.processrouteInfo.processName}} </el-tag></span>
+              <span>编码：<el-tag v-if="processRouteInfoSchema.processrouteInfo!=null">{{ processRouteInfoSchema.processrouteInfo.processrouteCode}} </el-tag> </span>
+              <span>版本：<el-tag v-if="processRouteInfoSchema.processrouteInfo!=null">{{ processRouteInfoSchema.processrouteInfo.routeVersion}} </el-tag> </span>
+            </el-space>
+            <el-divider />
+            <el-table
+              ref="tableRoute"
+              :data="nodeData"
+              :columns="nodeColumns"
+              border
+              stripe="true"
+              style="width: 100%"
+            >
+            <el-table-column prop="nodeSort" label="序号"  align="center"/>
+            <el-table-column prop="preCode" label="前置工序"  align="center">
+              
+                <template #default="scope">
+                  <div style="display: flex; align-items: center">
+                    <el-tag 
+                      >{{ scope.row.preNodeName }}</el-tag
+                    >
+                  </div>
+                </template>
+              </el-table-column>
+              <el-table-column prop="processCode" label="当前工序"  align="center" >
+                <template #default="scope">
+                  <div style="display: flex; align-items: center">
+                    <el-tag
+                      >{{ scope.row.nodeName }}</el-tag
+                    >
+                  </div>
+                </template>
+              </el-table-column>
+              <el-table-column prop="nextCode" label="后置工序" align="center">
+                <template #default="scope">
+                  <div style="display: flex; align-items: center">
+                    <el-tag
+                      >{{ scope.row.nextNodeName }}</el-tag
+                    >
+                  </div>
+                </template>
+              </el-table-column>
+            </el-table>
+          </div>
+        </el-tab-pane>
+        <el-tab-pane label="BOM信息" name="bomInfo"
+          ><div class="mt-20px">
+            <el-table
+              ref="tableRoute"
+              :data="bomInfoSchemaData"
+              style="width: 100%"
+            >
+            <el-table-column prop="productItemCode" label="父物料代码" align="center" />
+            <el-table-column prop="componentItemCode" label="子物料代码" align="center" />
+            <el-table-column prop="componentUom" label="子物料计量单位" align="center" />
+            <el-table-column prop="componentQty" label="子物料数量" align="center"/>
+            <el-table-column prop="version" label="版本" align="center" />
+            </el-table> </div
+        ></el-tab-pane>
+        <el-tab-pane label="班组人员信息" name="workTeamInfo"
+          ><div class="mt-20px">
+            <el-table
+              ref="tableRoute"
+              :data="workTeamInfoSchema"
+              style="width: 100%"
+            >
+            <el-table-column prop="id" label="ID" align="center" />
+            <el-table-column prop="userName" label="人员工号" align="center" />
+            <el-table-column prop="nickeName" label="显示名称" align="center" />
+            <el-table-column prop="workGroup" label="所属班组" align="center" />
+            <el-table-column prop="lineCode" label="所属产线" align="center" />
+            <el-table-column prop="abliity" label="技能岗位" align="center" />
+          </el-table> </div
+        ></el-tab-pane>
+        <el-tab-pane label="设备信息" name="deviceInfo"
+          ><div class="mt-20px">
+            <el-table
+              ref="tableRoute"
+              :data="deviceInfoSchema"
+              style="width: 100%"
+            >
+            <el-table-column prop="productItemCode" label="设备编码" align="center" />
+            <el-table-column prop="componentItemCode" label="设备名称" align="center" />
+            <el-table-column prop="componentUom" label="所属车间" align="center" />
+            <el-table-column prop="componentQty" label="所属产线" align="center"/>
+            <el-table-column prop="status" label="设备状态" align="center" />
+          </el-table> </div
+        ></el-tab-pane>
+      </el-tabs>
+    </el-drawer>
+  </div>
+</template>
+
+<script lang="ts" setup>
+import * as OrderDayApi from '@/api/mes/orderDay'
+defineOptions({ name: 'orderDetail' })
+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 activeName = ref('processRouteInfo')
+const props = defineProps({
+  allSchemas: {
+    type: Object,
+    required: true,
+    default: null
+  }
+})
+const detailData = ref(props.allSchemas)
+
+ const bomInfoSchemaData = ref( [{productItemCode:'----',
+  componentItemCode:'----',
+  componentUom:'----',
+  componentQty:'----',
+  version:'----'}])
+const workTeamInfoSchema = ref( [] )
+const deviceInfoSchema = ref([])
+const processRouteInfoSchema = ref({
+  processrouteInfo: { processrouteCode: '', processName: '', routeVersion: '' },
+  processrouteNodeDetailList: []
+})
+
+const isShowDrawer = ref(false)
+const detailLoading = ref(false)
+const nodeColumns = ref([
+  
+  {
+    label: '序号',
+    field: 'nodeSort'
+  },
+  {
+    label: '当前工序',
+    field: 'processCode'
+  },
+  {
+    label: '前置工序',
+    field: 'preCode'
+  },
+  {
+    label: '后置工序',
+    field: 'nextCode'
+  }
+])
+const nodeData = ref([{}])
+// Tabs当前选择
+const current = ref(0)
+const handleClick = (item, index) => {
+  current.value = index
+  emit('changeTabs', item)
+}
+
+/** 打开弹窗 */
+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
+  isShowDrawer.value = true
+  if (row) {
+    detailLoading.value = true
+    try {
+      detailData.value = row
+      getDetailData(row)
+    } finally {
+      detailLoading.value = false
+    }
+  }
+}
+defineExpose({ openDetail, formRef }) // 提供 open 方法，用于打开弹窗
+const getDetailData = async (row: any) => {
+  processRouteInfoSchema.value = await OrderDayApi.getProcessroutesDetail(row.processrouteCode)
+  let pam={code:row.standardBom.slice(0,row.standardBom.lastIndexOf('-')),version:row.standardBom.slice(row.standardBom.lastIndexOf('-')+1)}
+  //console.log(pam)
+  bomInfoSchemaData.value = await OrderDayApi.getPlanBom(pam)
+  nodeData.value = processRouteInfoSchema.value.processrouteNodeDetailList
+  
+}
+// 传递给父类
+const emit = defineEmits([
+  'searchTableSuccessDetail',
+  'changeTabs',
+  'selectChangeDetail',
+  'detailOpenForm',
+  'tableFormButton',
+  'openImage',
+  'onBlur',
+  'detailBasicFormOnChange',
+  'formFormDateChange'
+])
+
+//监视属性
+watch()
+</script>
+<style lang="scss">
+.el-drawer__body {
+  background: #f5f5f5 !important;
+}
+
+::v-deep(.label-class-name) {
+  color: #dedede;
+}
+</style>
+<style scoped lang="scss"></style>

src/views/mes/orderDay/components/schedule.vue

@@ -0,0 +1,332 @@
+<template>
+  <Dialog
+    :title="dialogTitle"
+    v-model="dialogVisible"
+    :width="dialogWidth"
+    :close-on-click-modal="false"
+  >
+    <ContentWrap>
+      <Descriptions
+        :data="detailData"
+        labelClassName="label-class-name"
+        label-align="left"
+        direction="vertical"
+        :column="8"
+        :schema="allSchemas.detailSchema"
+        :columns="2"
+        width="200px"
+      />
+    </ContentWrap>
+    <div style="height: 480px; overflow-y: auto">
+      <el-tabs type="border-card" :active-name="activeName">
+        <el-tab-pane label="调整工艺路线" name="process">
+          <el-container>
+            <el-aside>
+              <el-card style="max-width: 480px">
+                <template #header>
+                  <div class="card-header">
+                    <span>原有工序</span>
+                  </div>
+                </template>
+          <el-table :data="processData" ref="tableProcess" style="width: 100%; height: 80%">
+            <el-table-column prop="name" label="工序名称">
+              <template #default="scope">
+                <el-button size="mini" text @click="userAddNode(scope.row)" style="width: 100%"
+                  >{{ scope.row.name }}[{{ scope.row.code }}]</el-button
+                >
+              </template>
+            </el-table-column>
+            <el-table-column prop="code" label="工序编码" width="180" v-if="false" />
+          </el-table>
+              </el-card>
+            </el-aside>
+            <el-main><div ref="graphContainer"></div></el-main>
+            <!-- <el-aside
+              ><el-card style="max-width: 480px">
+                <template #header>
+                  <div class="card-header">
+                    <span>可选工序</span>
+                  </div>
+                </template>
+                <p v-for="o in 4" :key="o" class="text item">{{ 'List item ' + o }}</p>
+                <template #footer>Footer content</template>
+              </el-card></el-aside
+            > -->
+          </el-container>
+        </el-tab-pane>
+        <el-tab-pane label="调整临时BOM" name="boms">
+          <TableForm
+            ref="tableProcess"
+            :table-data="tableDataProcess"
+            :table-fields="tableColumnsProcess"
+            :loading="loading"
+            @handleAddTable="handleAddTable(tableDataProcess)"
+            @handle-delete-table="handleDeleteTable(item, index,tableDataProcess)"
+          />
+        </el-tab-pane>
+
+        <el-tab-pane label="调整可用设备" name="device"
+          ><TableForm
+            ref="tableProcess"
+            :table-data="tableDataProcess"
+            :table-fields="tableColumnsProcess"
+            :loading="loading"
+            @handleAddTable="handleAddTable(tableDataProcess)"
+            @handle-delete-table="handleDeleteTable(item, index,tableDataProcess)"
+        /></el-tab-pane>
+        <el-tab-pane label="调整班组人员" name="worker"
+          ><TableForm
+            ref="tableProcess"
+            :table-data="tableDataProcess"
+            :table-fields="tableColumnsProcess"
+            :loading="loading"
+            @handleAddTable="handleAddTable(tableDataProcess)"
+            @handle-delete-table="handleDeleteTable(item, index,tableDataProcess)"
+        /></el-tab-pane>
+      </el-tabs>
+    </div>
+    <template #footer>
+      <el-button @click="dialogVisible = false">发布计划</el-button>
+    </template>
+  </Dialog>
+  <!-- <SearchTable ref="searchTableRef" @searchTableSuccess="searchTableSuccess" /> -->
+</template>
+
+<script lang="ts" setup>
+defineOptions({ name: 'sechledDetail' })
+//import { dateFormatter } from '@/utils/formatTime'
+import {
+  start_node,
+  end_node,
+  createGraph,
+  getNewNode
+} from '@/views/mes/processroute/components/graphbase.data'
+import * as ProcessrouteApi from '@/api/mes/processroute'
+import { Graph } from '@antv/x6'
+const graphContainer = ref<HTMLElement | null>(null)
+const graph = ref<Graph>()
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+const activeName = ref('process')
+const loading = ref(true)
+const processData=ref()
+const props = defineProps({
+  // 查询弹窗是否显示筛选按钮
+  isSearchFilterButtonHide: {
+    type: Boolean,
+    default: false
+  },
+  // 显示窗口宽度设置
+  basicFormWidth: {
+    type: String,
+    default: ''
+  },
+
+  allSchemas: {
+    type: Object,
+    required: true,
+    default: null
+  }
+})
+const detailData = ref(props.allSchemas)
+const route = useRoute() // 路由信息
+const routeName = ref()
+const tableDataProcess = ref([
+  {
+    type: '',
+    value: ''
+  }
+])
+const tableColumnsProcess = ref([
+  {
+    label: '结束时间',
+    field: 'endTime',
+    sort: 'custom',
+    isReadonly: true,
+    form: {
+      component: 'TimePicker',
+      componentProps: {
+        type: 'time',
+        dateFormat: 'HH:mm'
+      }
+    }
+  },
+  {
+    label: '生产模式',
+    field: 'taskMode',
+    width: '80px',
+    sort: 'custom',
+    dictType: 'mes_task_mode',
+    dictClass: 'string',
+    form: {
+      component: 'Select',
+      value: 'ASSIGN'
+    }
+  }
+])
+
+// 添加数据
+const handleAddTable = (name:any) => {
+  message.success('添加成功')
+  let tableFormKeys = {
+    type: '',
+    value: ''
+  }
+  name.push(JSON.parse(JSON.stringify(tableFormKeys)))
+}
+// 删除明细
+const handleDeleteTable = (item, index,name) => {
+  console.log(name)
+  name.splice(index, 1)
+}
+
+routeName.value = route.name
+routeName.value = routeName.value.substring(0, routeName.value.length - 4) + 'Detail'
+//const updateKey = ref(0)
+const dialogWidth = ref()
+// if (props.basicFormWidth) {
+//   dialogWidth.value = props.basicFormWidth + '%'
+// } else {
+//   dialogWidth.value = props.isBusiness ? '60%' : '40%'
+// }
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+let graphJson = {
+  cells: [
+    {
+      position: {
+        x: 40,
+        y: 40
+      },
+      size: {
+        width: 100,
+        height: 40
+      },
+      attrs: {
+        text: {
+          text: 'Hello'
+        },
+        body: {
+          stroke: '#8f8f8f',
+          strokeWidth: 1,
+          fill: '#fff',
+          rx: 6,
+          ry: 6
+        }
+      },
+      visible: true,
+      shape: 'rect',
+      id: 'adbc20c6-96e4-4792-9e5b-42df6066cff0',
+      zIndex: 1
+    },
+    {
+      position: {
+        x: 240,
+        y: 180
+      },
+      size: {
+        width: 100,
+        height: 40
+      },
+      attrs: {
+        text: {
+          text: 'World'
+        },
+        body: {
+          stroke: '#8f8f8f',
+          strokeWidth: 1,
+          fill: '#fff',
+          rx: 6,
+          ry: 6
+        }
+      },
+      visible: true,
+      shape: 'ellipse',
+      id: '9b1f1e94-a01f-4902-bfae-4e6e81029261',
+      zIndex: 2
+    },
+    {
+      shape: 'edge',
+      attrs: {
+        line: {
+          stroke: '#8f8f8f',
+          strokeWidth: 1
+        }
+      },
+      id: '8fd50f13-22ba-41ff-b54a-eb6d8553c3d7',
+      source: {
+        cell: 'adbc20c6-96e4-4792-9e5b-42df6066cff0'
+      },
+      target: {
+        cell: '9b1f1e94-a01f-4902-bfae-4e6e81029261'
+      },
+      labels: [
+        {
+          attrs: {
+            label: {
+              text: 'X6'
+            }
+          }
+        }
+      ],
+      zIndex: 3
+    }
+  ]
+}
+/** 打开弹窗 */
+const open = async (type: string, row?: any, titleName?: any) => {
+  dialogVisible.value = true
+  detailData.value = row
+  dialogWidth.value = props.basicFormWidth + '%'
+  //console.log(props.allSchemas)
+  //console.log(row)
+  if (titleName) {
+    dialogTitle.value = t('action.' + titleName)
+  } else {
+    dialogTitle.value = t('action.' + type)
+  }
+  nextTick(() => {
+    graph.value = createGraph(graphContainer.value as HTMLElement, false, dialogWidth.value-200, 320)
+    // graph.value.on('node:click', ({ e, x, y, node, view }) => {
+    //   nodeClick(e, x, y, node, view)
+    // })
+    graph.value?.fromJSON(graphJson.cells)
+  })
+}
+
+//添加节点
+const userAddNode = (row) => {
+  if (graph && graph.value != undefined) {
+    let node_template = getNewNode(row.code, row.name, row.code)
+    node_template.x = end_node.value.x - 100
+    node_template.y = end_node.value.y + 100
+    let noden = graph.value.addNode(node_template)
+    if (graph.value.getNodes().length == 1) {
+      let start = graph.value.addNode(start_node.value)
+      let end = graph.value.addNode(end_node.value)
+      graph.value.addEdge({
+        id: 'startEdge',
+        source: start.id, // 源节点 ID
+        target: noden.id
+      })
+      graph.value.addEdge({
+        id: 'endEdge',
+        source: noden.id, // 源节点 ID
+        target: end.id
+      })
+    }
+  }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+</script>
+<style lang="scss">
+.el-drawer__body {
+  background: #f5f5f5 !important;
+}
+
+::v-deep(.label-class-name) {
+  color: #dedede;
+}
+</style>
+<style scoped lang="scss"></style>

src/views/mes/orderDay/index.vue

@@ -0,0 +1,331 @@
+<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"
+  />
+
+  <!-- 详情 -->
+  <orderDetail ref="detailRef" :all-schemas="OrderDay.allSchemas" />
+  <scheduleDetail ref="scheduleDetailRef"  :all-schemas="OrderDay.allSchemas" :basicFormWidth="75"/>
+  <!-- 导入 -->
+  <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 orderDetail from './components/orderDetail.vue'
+import scheduleDetail from './components/schedule.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: 'publish',
+      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: 'stopPlan',
+      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)
+  } else if(val=='schedule'){  //发布计划
+    openScheduledDetail( '发布计划', row,row.planNoDay)
+  }
+}
+
+/** 添加/修改操作 */
+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 scheduleDetailRef = ref()
+const openScheduledDetail = (row: any, titleName: any, titleValue: any) => {
+  scheduleDetailRef.value.open(row, titleName, titleValue)
+}
+/** 删除按钮操作 */
+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>

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: false,
+    isForm: false,
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    isSearch: false,
+    isTable:false,
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 200,
+      fixed: 'right'
+    }
+  }
+]))

src/views/mes/processroute/components/configDialog.vue

@@ -43,7 +43,28 @@
             <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">
@@ -53,9 +74,9 @@
                 <span>产品信息</span>
               </div>
             </template>
-            <p>产品名称：{{ productData.name }}</p>
-            <p>产品编码：{{ productData.code }}</p>
-            <p>产品描述：{{ productData.desc1 }}</p>
+            <p >产品名称：<span v-if="productData!=null">{{ productData.name }}</span></p>
+            <p>产品编码：<span v-if="productData!=null">{{ productData.code }}</span></p>
+            <p>产品描述：<span v-if="productData!=null">{{ productData.desc1 }}</span></p>
           </el-card>
         </el-col>
         <el-col :span="6"
@@ -94,12 +115,14 @@
   </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'
 import { Graph } from '@antv/x6'
-//import { async } from '@antv/x6/lib/registry/marker/async'
-//import { object } from 'vue-types'
 const graphContainer = ref<HTMLElement | null>(null)
 defineOptions({ name: 'ProcessRouteConfig' })
 const isShowDrawer = ref(false)
@@ -123,8 +146,18 @@ const deviceList = ref([
   { name: '设备', code: '0000' },
   { name: '设备', code: '0000' }
 ]) //设备数据
+
 const workerList = ref([{ name: '--' }, { name: '--' }]) //人员数据
 const workStationData = ref({ name: '工位', code: '' }) //工位数据
+// 附件默认数据
+const annexData = reactive({
+  annexList: []
+})
+// 备注数据
+const remarksData = reactive({
+  remarksList: [],
+  data: {}
+})
 //初始化图形组件
 const graph = ref<Graph>()
 const openDetail = async (rowData: any) => {
@@ -132,16 +165,24 @@ const openDetail = async (rowData: any) => {
   titleNameRef.value = rowData.value.processrouteCode
   titleValueRef.value = rowData.value.processName
   processRouteId.value = rowData.value.id
+  remarksData.data = {
+    tableId: rowData.value.id,
+    tableName: rowData.value.processrouteCode
+  }
+  if(rowData){
   let graphJson = JSON.parse(rowData.value.graphJson)
   isShowDrawer.value = true
   nextTick(() => {
-    graph.value = createGraph(graphContainer.value as HTMLElement)
+    graph.value = createGraph(graphContainer.value as HTMLElement,true,800,600)
     graph.value.on('node:click', ({ e, x, y, node, view }) => {
       nodeClick(e, x, y, node, view)
     })
     graph.value.fromJSON(graphJson.cells)
   })
   getItembasicInfo(rowData.value.productCode)
+  getRemarkList()
+      getFileList()
+      getChangeRecordList()}
 }
 //关闭后销毁图形组件
 const handleDrawerClose = () => {
@@ -243,7 +284,7 @@ const userAddNode = (row) => {
 //-------
 defineExpose({ openDetail, createGraph }) // 提供 open 方法，用于打开弹窗
 onMounted(() => {
-  registerNodes()
+  //registerNodes()
 
   getProcessList()
 })
@@ -274,6 +315,49 @@ const saveResult = async () => {
   emit('close')
   //return res
 }
+
+// 获取备注列表
+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 changeRecordData = reactive({
+  changeRecordList: []
+})
+// 获取附件列表篇
+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()
+}
 // 验证图形
 onUnmounted(() => {})
 const emit = defineEmits(['close'])

src/views/mes/processroute/components/graphbase.data.ts

@@ -163,11 +163,13 @@ export const end_node = ref({
   shape: 'base-node',
   ports: [{ id: 'in', group: 'in' }]
 })
-export const createGraph = (graphContainer: any) => {
+export const createGraph = (graphContainer: any,autoResizer:boolean,width:number,height:number) => {
   const ret = ref<Graph>()
   ret.value= new Graph({
     container: graphContainer,
-    autoResize: true,
+    autoResize: autoResizer,
+    width:width,
+    height:height,
     background: { color: '#F2F7FA' }, // 创建画布时初始化背景相关配置对象
     grid: { size: 10, visible: true, type: 'mesh' }, //创建画布时，通过配置对象来设置背景网格
     mousewheel: {
@@ -255,6 +257,8 @@ export const createGraph = (graphContainer: any) => {
   ret.value.on('edge:mouseleave', ({ cell }) => {
     cell.removeTools()
   })
+  Graph.registerNode('process-node', process_node.value, true)
+  Graph.registerNode('base-node', base_node.value, true)
   return ret.value
 }
 //注册节点