diff --git a/src/api/mes/baseClassTeamInfo/index.ts b/src/api/mes/baseClassTeamInfo/index.ts
index 75df354..8c50495 100644
--- a/src/api/mes/baseClassTeamInfo/index.ts
+++ b/src/api/mes/baseClassTeamInfo/index.ts
@@ -61,3 +61,16 @@ export const delBaseClassTeamInfo = (classTeamId: string | number | Array<string
     method: 'delete'
   });
 };
+
+/**
+ * 下拉框查询班组信息列表
+ * @param query
+ * @returns {*}
+ */
+export function getBaseClassTeamInfoList (query) {
+  return request({
+    url: '/mes/baseClassTeamInfo/getBaseClassTeamInfoList',
+    method: 'get',
+    params: query
+  });
+};
diff --git a/src/api/mes/baseRoute/index.ts b/src/api/mes/baseRoute/index.ts
index 6bdf79b..4e69adc 100644
--- a/src/api/mes/baseRoute/index.ts
+++ b/src/api/mes/baseRoute/index.ts
@@ -70,7 +70,7 @@ export const delBaseRoute = (routeId: string | number | Array<string | number>)
  */
 export function getBaseRouteList(query) {
   return request({
-    url: '/mes/baseRoute/getBaseRouteList',
+    url: '/mes/baseRoute/getProdBaseRouteList',
     method: 'get',
     params: query
   });
diff --git a/src/api/system/masterData/index.ts b/src/api/system/masterData/index.ts
new file mode 100644
index 0000000..b761d83
--- /dev/null
+++ b/src/api/system/masterData/index.ts
@@ -0,0 +1,77 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { MasterDataVO, MasterDataForm, MasterDataQuery } from '@/api/system/masterData/types';
+
+/**
+ * 查询主数据维护列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listMasterData = (query?: MasterDataQuery): AxiosPromise<MasterDataVO[]> => {
+  return request({
+    url: '/system/masterData/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询主数据维护详细
+ * @param masterDataId
+ */
+export const getMasterData = (masterDataId: string | number): AxiosPromise<MasterDataVO> => {
+  return request({
+    url: '/system/masterData/' + masterDataId,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增主数据维护
+ * @param data
+ */
+export const addMasterData = (data: MasterDataForm) => {
+  return request({
+    url: '/system/masterData',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改主数据维护
+ * @param data
+ */
+export const updateMasterData = (data: MasterDataForm) => {
+  return request({
+    url: '/system/masterData',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除主数据维护
+ * @param masterDataId
+ */
+export const delMasterData = (masterDataId: string | number | Array<string | number>) => {
+  return request({
+    url: '/system/masterData/' + masterDataId,
+    method: 'delete'
+  });
+};
+
+
+/**
+ * 下拉框查询主数据维护列表
+ * @param query
+ * @returns {*}
+ */
+export function getSysMasterDataList (query) {
+    return request({
+        url: '/system/masterData/getSysMasterDataList',
+        method: 'get',
+        params: query
+    });
+};
diff --git a/src/api/system/masterData/types.ts b/src/api/system/masterData/types.ts
new file mode 100644
index 0000000..f711dc9
--- /dev/null
+++ b/src/api/system/masterData/types.ts
@@ -0,0 +1,281 @@
+export interface MasterDataVO {
+  /**
+   * 主键标识
+   */
+  masterDataId: string | number;
+
+  /**
+   * 所属模块（1MES 2WMS 3DMS 4QMS 5EMS）
+   */
+  moduleType: string;
+
+  /**
+   * 父级标识;（1是 0否）
+   */
+  parentFlag: string;
+
+  /**
+   * 菜单ID
+   */
+  menuId: string | number;
+
+  /**
+   * 路由参数
+   */
+  queryParam: string;
+
+  /**
+   * 主数据标题;例：品牌、层级、花纹
+   */
+  masterDataTitle: string;
+
+  /**
+   * 预留字段1名称
+   */
+  fieldName1: string;
+
+  /**
+   * 预留字段1显示标识;（1是 0否）
+   */
+  displayFlag1: string;
+
+  /**
+   * 预留字段2名称
+   */
+  fieldName2: string;
+
+  /**
+   * 预留字段2显示标识;（1是 0否）
+   */
+  displayFlag2: string;
+
+  /**
+   * 预留字段3名称
+   */
+  fieldName3: string;
+
+  /**
+   * 预留字段3显示标识;（1是 0否）
+   */
+  displayFlag3: string;
+
+  /**
+   * 预留字段4名称
+   */
+  fieldName4: string;
+
+  /**
+   * 预留字段4显示标识;（1是 0否）
+   */
+  displayFlag4: string;
+
+  /**
+   * 预留字段5名称
+   */
+  fieldName5: string;
+
+  /**
+   * 预留字段5显示标识;（1是 0否）
+   */
+  displayFlag5: string;
+
+  /**
+   * 激活标识(1是 0否)
+   */
+  activeFlag: string;
+
+  /**
+   * 备注
+   */
+  remark: string;
+
+}
+
+export interface MasterDataForm extends BaseEntity {
+  /**
+   * 主键标识
+   */
+  masterDataId?: string | number;
+
+  /**
+   * 所属模块（1MES 2WMS 3DMS 4QMS 5EMS）
+   */
+  moduleType?: string;
+
+  /**
+   * 父级标识;（1是 0否）
+   */
+  parentFlag?: string;
+
+  /**
+   * 菜单ID
+   */
+  menuId?: string | number;
+
+  /**
+   * 路由参数
+   */
+  queryParam?: string;
+
+  /**
+   * 主数据标题;例：品牌、层级、花纹
+   */
+  masterDataTitle?: string;
+
+  /**
+   * 预留字段1名称
+   */
+  fieldName1?: string;
+
+  /**
+   * 预留字段1显示标识;（1是 0否）
+   */
+  displayFlag1?: string;
+
+  /**
+   * 预留字段2名称
+   */
+  fieldName2?: string;
+
+  /**
+   * 预留字段2显示标识;（1是 0否）
+   */
+  displayFlag2?: string;
+
+  /**
+   * 预留字段3名称
+   */
+  fieldName3?: string;
+
+  /**
+   * 预留字段3显示标识;（1是 0否）
+   */
+  displayFlag3?: string;
+
+  /**
+   * 预留字段4名称
+   */
+  fieldName4?: string;
+
+  /**
+   * 预留字段4显示标识;（1是 0否）
+   */
+  displayFlag4?: string;
+
+  /**
+   * 预留字段5名称
+   */
+  fieldName5?: string;
+
+  /**
+   * 预留字段5显示标识;（1是 0否）
+   */
+  displayFlag5?: string;
+
+  /**
+   * 激活标识(1是 0否)
+   */
+  activeFlag?: string;
+
+  /**
+   * 备注
+   */
+  remark?: string;
+
+}
+
+export interface MasterDataQuery extends PageQuery {
+
+  /**
+   * 主键标识
+   */
+  masterDataId?: string | number;
+
+  /**
+   * 所属模块（1MES 2WMS 3DMS 4QMS 5EMS）
+   */
+  moduleType?: string;
+
+  /**
+   * 父级标识;（1是 0否）
+   */
+  parentFlag?: string;
+
+  /**
+   * 菜单ID
+   */
+  menuId?: string | number;
+
+  /**
+   * 路由参数
+   */
+  queryParam?: string;
+
+  /**
+   * 主数据标题;例：品牌、层级、花纹
+   */
+  masterDataTitle?: string;
+
+  /**
+   * 预留字段1名称
+   */
+  fieldName1?: string;
+
+  /**
+   * 预留字段1显示标识;（1是 0否）
+   */
+  displayFlag1?: string;
+
+  /**
+   * 预留字段2名称
+   */
+  fieldName2?: string;
+
+  /**
+   * 预留字段2显示标识;（1是 0否）
+   */
+  displayFlag2?: string;
+
+  /**
+   * 预留字段3名称
+   */
+  fieldName3?: string;
+
+  /**
+   * 预留字段3显示标识;（1是 0否）
+   */
+  displayFlag3?: string;
+
+  /**
+   * 预留字段4名称
+   */
+  fieldName4?: string;
+
+  /**
+   * 预留字段4显示标识;（1是 0否）
+   */
+  displayFlag4?: string;
+
+  /**
+   * 预留字段5名称
+   */
+  fieldName5?: string;
+
+  /**
+   * 预留字段5显示标识;（1是 0否）
+   */
+  displayFlag5?: string;
+
+  /**
+   * 激活标识(1是 0否)
+   */
+  activeFlag?: string;
+
+    /**
+     * 日期范围参数
+     */
+    params?: any;
+}
+
+
+
diff --git a/src/api/system/masterDataDetail/index.ts b/src/api/system/masterDataDetail/index.ts
new file mode 100644
index 0000000..6cabb45
--- /dev/null
+++ b/src/api/system/masterDataDetail/index.ts
@@ -0,0 +1,77 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { MasterDataDetailVO, MasterDataDetailForm, MasterDataDetailQuery } from '@/api/system/masterDataDetail/types';
+
+/**
+ * 查询主数据维护明细列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listMasterDataDetail = (query?: MasterDataDetailQuery): AxiosPromise<MasterDataDetailVO[]> => {
+  return request({
+    url: '/system/masterDataDetail/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询主数据维护明细详细
+ * @param masterDataDetailId
+ */
+export const getMasterDataDetail = (masterDataDetailId: string | number): AxiosPromise<MasterDataDetailVO> => {
+  return request({
+    url: '/system/masterDataDetail/' + masterDataDetailId,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增主数据维护明细
+ * @param data
+ */
+export const addMasterDataDetail = (data: MasterDataDetailForm) => {
+  return request({
+    url: '/system/masterDataDetail',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改主数据维护明细
+ * @param data
+ */
+export const updateMasterDataDetail = (data: MasterDataDetailForm) => {
+  return request({
+    url: '/system/masterDataDetail',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除主数据维护明细
+ * @param masterDataDetailId
+ */
+export const delMasterDataDetail = (masterDataDetailId: string | number | Array<string | number>) => {
+  return request({
+    url: '/system/masterDataDetail/' + masterDataDetailId,
+    method: 'delete'
+  });
+};
+
+
+/**
+ * 下拉框查询主数据维护明细列表
+ * @param query
+ * @returns {*}
+ */
+export function getSysMasterDataDetailList(query) {
+  return request({
+    url: '/system/masterDataDetail/getSysMasterDataDetailList',
+    method: 'get',
+    params: query
+  });
+};
diff --git a/src/api/system/masterDataDetail/types.ts b/src/api/system/masterDataDetail/types.ts
new file mode 100644
index 0000000..c4a96d1
--- /dev/null
+++ b/src/api/system/masterDataDetail/types.ts
@@ -0,0 +1,221 @@
+export interface MasterDataDetailVO {
+  /**
+   * 主键标识
+   */
+  masterDataDetailId: string | number;
+
+  /**
+   * 主数据ID
+   */
+  masterDataId: string | number;
+
+  /**
+   * 父级标识
+   */
+  parentId: string | number;
+
+  /**
+   * 祖级列表
+   */
+  ancestors: string;
+
+  /**
+   * 主数据明细编号
+   */
+  dataDetailCode: string;
+
+  /**
+   * 主数据明细名称
+   */
+  dataDetailName: string;
+
+  /**
+   * 预留字段1数据
+   */
+  fieldData1: string;
+
+  /**
+   * 预留字段2数据
+   */
+  fieldData2: string;
+
+  /**
+   * 预留字段3数据
+   */
+  fieldData3: string;
+
+  /**
+   * 预留字段4数据
+   */
+  fieldData4: string;
+
+  /**
+   * 预留字段5数据
+   */
+  fieldData5: string;
+
+  /**
+   * 显示排序
+   */
+  displaySort: number;
+
+  /**
+   * 备注
+   */
+  remark: string;
+
+  /**
+   * 激活标识(1是 0否)
+   */
+  activeFlag: string;
+
+}
+
+export interface MasterDataDetailForm extends BaseEntity {
+  /**
+   * 主键标识
+   */
+  masterDataDetailId?: string | number;
+
+  /**
+   * 主数据ID
+   */
+  masterDataId?: string | number;
+
+  /**
+   * 父级标识
+   */
+  parentId?: string | number;
+
+  /**
+   * 祖级列表
+   */
+  ancestors?: string;
+
+  /**
+   * 主数据明细编号
+   */
+  dataDetailCode?: string;
+
+  /**
+   * 主数据明细名称
+   */
+  dataDetailName?: string;
+
+  /**
+   * 预留字段1数据
+   */
+  fieldData1?: string;
+
+  /**
+   * 预留字段2数据
+   */
+  fieldData2?: string;
+
+  /**
+   * 预留字段3数据
+   */
+  fieldData3?: string;
+
+  /**
+   * 预留字段4数据
+   */
+  fieldData4?: string;
+
+  /**
+   * 预留字段5数据
+   */
+  fieldData5?: string;
+
+  /**
+   * 显示排序
+   */
+  displaySort?: number;
+
+  /**
+   * 备注
+   */
+  remark?: string;
+
+  /**
+   * 激活标识(1是 0否)
+   */
+  activeFlag?: string;
+
+}
+
+export interface MasterDataDetailQuery extends PageQuery {
+
+  /**
+   * 主键标识
+   */
+  masterDataDetailId?: string | number;
+
+  /**
+   * 主数据ID
+   */
+  masterDataId?: string | number;
+
+  /**
+   * 父级标识
+   */
+  parentId?: string | number;
+
+  /**
+   * 祖级列表
+   */
+  ancestors?: string;
+
+  /**
+   * 主数据明细编号
+   */
+  dataDetailCode?: string;
+
+  /**
+   * 主数据明细名称
+   */
+  dataDetailName?: string;
+
+  /**
+   * 预留字段1数据
+   */
+  fieldData1?: string;
+
+  /**
+   * 预留字段2数据
+   */
+  fieldData2?: string;
+
+  /**
+   * 预留字段3数据
+   */
+  fieldData3?: string;
+
+  /**
+   * 预留字段4数据
+   */
+  fieldData4?: string;
+
+  /**
+   * 预留字段5数据
+   */
+  fieldData5?: string;
+
+  /**
+   * 显示排序
+   */
+  displaySort?: number;
+
+  /**
+   * 激活标识(1是 0否)
+   */
+  activeFlag?: string;
+
+    /**
+     * 日期范围参数
+     */
+    params?: any;
+}
+
+
+
diff --git a/src/router/index.ts b/src/router/index.ts
index 8d61065..943c7fe 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -218,7 +218,22 @@ export const dynamicRoutes: RouteRecordRaw[] = [
         meta: { title: '请假申请', activeMenu: '/workflow/leave', noCache: true }
       }
     ]
+  },
+{
+  path: '/mes/product-plan',
+    component: Layout,
+  hidden: true,
+  permissions: ['mes:orderInfo:edit'],
+  children: [
+  {
+    path: 'index/:productOrderId(\\d+)',
+    component: () => import('@/views/mes/orderInfo/editProductPlan.vue'),
+    name: 'productPlanEdit',
+    meta: { title: '生产派工', activeMenu: '/mes/productplan', noCache: true }
   }
+]
+},
+
 ];
 
 /**
diff --git a/src/views/mes/orderInfo/editProductPlan.vue b/src/views/mes/orderInfo/editProductPlan.vue
new file mode 100644
index 0000000..fc8d629
--- /dev/null
+++ b/src/views/mes/orderInfo/editProductPlan.vue
@@ -0,0 +1,1553 @@
+<template>
+  <div>
+    <el-card>
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+        <el-divider content-position="left"><span style="font-weight: bold; font-size: larger;">工单信息</span>
+        </el-divider>
+        <el-row :gutter="10">
+          <el-col :span="12">
+            <el-form-item label="任务编号：">{{ form.orderCode }}</el-form-item>
+            <el-form-item label="成品编码：">{{ form.materialCode }}</el-form-item>
+            <el-form-item label="计划开始时间：">{{ form.planBeginTime }}</el-form-item>
+            <el-form-item label="计划数量/已派工数量/完成数量：" label-width="220px">
+              {{
+                form.planAmount
+              }}/{{
+                form.dispatchAmount == null || form.dispatchAmount === undefined ? 0 : form.dispatchAmount
+              }}/{{ form.completeAmount }}
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="工艺路线：">{{ form.dispatchName }}</el-form-item>
+            <el-form-item label="成品名称：">{{ form.materialName }}</el-form-item>
+            <el-form-item label="计划结束时间：">{{ form.planEndTime }}</el-form-item>
+            <el-form-item label="任务状态：">
+              <template slot-scope="scope">
+              </template>
+            </el-form-item>
+
+
+          </el-col>
+        </el-row>
+
+        <el-divider content-position="left"><span style="font-weight: bold; font-size: larger;">派工信息</span>
+        </el-divider>
+
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button icon="el-icon-plus" size="mini" type="primary" @click="handleAddMesProductPlan"
+                       v-if="form.orderStatus!==ORDER_STATUS.FINISHED && form.orderStatus!=ORDER_STATUS.RECALLED && form.orderStatus!=ORDER_STATUS.DELETED">
+              新增
+            </el-button>
+          </el-col>
+        </el-row>
+        <el-table ref="mesProductPlan" :data="mesProductPlanList"
+                  :row-class-name="rowMesProductPlanIndex" @selection-change="handleMesProductPlanSelectionChange"
+                  :tree-props="{children: 'children'}"
+                  style="width: 100%;margin-bottom: 20px;"
+                  row-key="id"
+                  border
+                  default-expand-all
+        >
+          <el-table-column label="序号" type="index" align="center">
+
+          </el-table-column>
+
+          <el-table-column
+            width="80"
+            label="删除"
+            type=""
+          >
+            <template slot-scope="scope">
+              <el-button type="danger" icon="el-icon-delete" @click="handleDeleteMesProductPlan(scope)"
+                         v-if="scope.row.firstFlag != null && scope.row.firstFlag === '1'
+                         && form.orderStatus!==ORDER_STATUS.FINISHED && form.orderStatus!==ORDER_STATUS.RECALLED && form.orderStatus!==ORDER_STATUS.DELETED"></el-button>
+            </template>
+          </el-table-column>
+
+<!--          <el-table-column-->
+<!--            width="80"-->
+<!--            type=""-->
+<!--            label="添加"-->
+<!--          >-->
+<!--            <template slot-scope="scope" v-if="">-->
+<!--              <el-button type="primary" icon="el-icon-plus" @click="addProcessUser(scope)"-->
+<!--                         v-if="(scope.row.children != null && scope.row.children !== undefined)-->
+<!--                          && scope.row.processType!== PROCESS_TYPE.AUTO && scope.row.displayFlag !== DISPLAY_FLAG.NO"-->
+<!--                         :disabled="scope.row.addFlag !=='1'-->
+<!--                           || form.orderStatus===ORDER_STATUS.FINISHED || form.orderStatus===ORDER_STATUS.RECALLED || form.orderStatus===ORDER_STATUS.DELETED">-->
+
+<!--              </el-button>-->
+<!--            </template>-->
+<!--          </el-table-column>-->
+
+          <el-table-column
+            width="50"
+          >
+            <!--        <template slot-scope="scope">-->
+            <!--          <el-button type="primary" icon="el-icon-plus" @click="add(scope)"></el-button>-->
+            <!--        </template>-->
+          </el-table-column>
+
+
+          <el-table-column align="center" label="派工单号" prop="dispatchCode" width="230">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.dispatchCode" :disabled="true"
+                        v-if="scope.row.children != null && scope.row.children !== undefined"/>
+            </template>
+          </el-table-column>
+          <el-table-column align="center" label="工序" prop="processName" width="140">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.processName" :disabled="true"
+                        v-if="scope.row.children != null && scope.row.children !== undefined"/>
+            </template>
+          </el-table-column>
+          <el-table-column align="center" label="步骤" prop="processOrder">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.processOrder" :disabled="true"
+                        v-if="scope.row.children != null && scope.row.children !== undefined"/>
+            </template>
+          </el-table-column>
+          <el-table-column align="center" label="派工数量" prop="dispatchAmount" width="100">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.dispatchAmount" :disabled="scope.row.oldRowFlag"
+                        v-if="scope.row.children != null && scope.row.children !== undefined
+                        && scope.row.firstFlag != null && scope.row.firstFlag === '1'"
+              />
+            </template>
+          </el-table-column>
+
+          <el-table-column align="center" label="用户" prop="userId" width="140">
+            <template slot-scope="scope">
+              <el-select v-model="scope.row.userId" placeholder="请选择用户"
+                         v-if="scope.row.children == null || scope.row.children === undefined"
+                         :disabled="scope.row.planId != null && scope.row.planId !== undefined && scope.row.planId !== ''"
+              >
+                <el-option
+                  v-for="item in processUsers[scope.row.processId]"
+                  :key="item.userId"
+                  :label="item.userName"
+                  :value="item.userId"
+                ></el-option>
+              </el-select>
+
+            </template>
+          </el-table-column>
+
+          <el-table-column align="center" label="派工标准工时(小时)" prop="productionTime" width="180">
+            <template slot-scope="scope">
+              <el-input-number style="width:150px;" :min="0" v-model="scope.row.productionTime"
+                               :disabled="(scope.row.processType === PROCESS_TYPE.MANUAL && scope.row.children != null && scope.row.children !== undefined)
+                                || scope.row.planStatus=== PLAN_STATUS.FINISHED || form.orderStatus===ORDER_STATUS.FINISHED || form.orderStatus===ORDER_STATUS.RECALLED || form.orderStatus===ORDER_STATUS.DELETED"/>
+            </template>
+          </el-table-column>
+          <el-table-column align="center" label="计划开始时间" prop="planBeginTime" width="230">
+            <template slot-scope="scope">
+              <el-date-picker v-model="scope.row.planBeginTime" style="width:200px;"
+                              :disabled="(scope.row.processType === PROCESS_TYPE.MANUAL && scope.row.children != null && scope.row.children !== undefined)
+                              || scope.row.planStatus=== PLAN_STATUS.FINISHED || form.orderStatus===ORDER_STATUS.FINISHED || form.orderStatus===ORDER_STATUS.RECALLED || form.orderStatus===ORDER_STATUS.DELETED"
+                              clearable
+                              placeholder="请选择计划开始时间"
+                              type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+              />
+            </template>
+          </el-table-column>
+          <el-table-column align="center" label="计划完成时间" prop="planEndTime" width="230">
+            <template slot-scope="scope">
+              <el-date-picker v-model="scope.row.planEndTime" style="width:200px;"
+                              :disabled="(scope.row.processType === PROCESS_TYPE.MANUAL && scope.row.children != null && scope.row.children !== undefined)
+                              || scope.row.planStatus=== PLAN_STATUS.FINISHED || form.orderStatus===ORDER_STATUS.FINISHED || form.orderStatus===ORDER_STATUS.RECALLED || form.orderStatus===ORDER_STATUS.DELETED"
+                              clearable
+                              placeholder="请选择计划完成时间"
+                              type="datetime" value-format="yyyy-MM-dd HH:mm:ss"/>
+            </template>
+          </el-table-column>
+
+          <el-table-column align="center" label="状态" prop="planStatus" width="150">
+            <template slot-scope="scope">
+              {{scope.row.planStatus}}
+
+            </template>
+          </el-table-column>
+
+
+          <el-table-column align="center" class-name="small-padding fixed-width" label="操作" width="100">
+            <template slot-scope="scope">
+              <el-button
+                icon="el-icon-search"
+                size="mini"
+                type="primary"
+                @click="handleDrawing(scope.row)"
+                v-if=" scope.row.userId != null"
+              >图纸
+              </el-button>
+              <el-button
+                icon="el-icon-search"
+                size="mini"
+                type="success"
+                @click="handleSop(scope.row)"
+                v-if=" scope.row.userId != null"
+              >SOP
+              </el-button>
+
+              <el-button
+                icon="el-icon-lock"
+                size="mini"
+                type="primary"
+                @click="handleApplyRawOutstock(scope.row)"
+                v-if="scope.row.processType === PROCESS_TYPE.AUTO && scope.row.planId!=null && scope.row.planId!==''
+                      && scope.row.planStatus !== PLAN_STATUS.FINISHED
+                      && form.orderStatus!==ORDER_STATUS.FINISHED && form.orderStatus!==ORDER_STATUS.RECALLED && form.orderStatus!==ORDER_STATUS.DELETED"
+              >投料
+              </el-button>
+
+
+              <el-button
+                icon="el-icon-delete"
+                size="mini"
+                type="danger"
+                @click="handleDeleteDispatchUser(scope.row)"
+                v-if="(scope.row.children == null || false)  "
+                :disabled="(scope.row.planStatus !== PLAN_STATUS.TO_DISPATCH && scope.row.planStatus !== PLAN_STATUS.DISPATCHED) || form.orderStatus===ORDER_STATUS.FINISHED || form.orderStatus===ORDER_STATUS.RECALLED || form.orderStatus===ORDER_STATUS.DELETED"
+              >删除
+              </el-button>
+
+            </template>
+          </el-table-column>
+
+
+        </el-table>
+      </el-form>
+      <el-form label-width="100px">
+        <el-form-item style="text-align: center;margin-left:-100px;margin-top:10px;">
+          <el-button type="primary" @click="submitForm()"
+                     v-if="form.orderStatus!==ORDER_STATUS.FINISHED && form.orderStatus!==ORDER_STATUS.RECALLED && form.orderStatus!==ORDER_STATUS.DELETED">
+            提交
+          </el-button>
+          <el-button @click="close()">返回</el-button>
+        </el-form-item>
+      </el-form>
+    </el-card>
+    <el-dialog
+      :visible.sync="blueprintModel"
+      title="上传图纸"
+      width="30%"
+      @before-close="blueprintModel = false">
+      <el-form ref="form">
+        <el-form-item label="选择BOM图纸">
+          <el-select v-model="materialBomAttachIdList"  placeholder="请选择选择BOM图纸" multiple filterable :clearable="false"
+                     :disabled="(addProductPlanObject.planStatus !== PLAN_STATUS.DISPATCHED)">
+            <el-option
+              v-for="item in attachInfoList"
+              :key="item.attachId"
+              :label="item.attachName"
+              :value="item.attachId"
+              :disabled="isOptionDisabled(item.attachId)"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <el-upload
+        single
+        ref="drawingUpload"
+        list-type="picture-card"
+        action="uploadDrawingUrl"
+        :auto-upload="true"
+        :limit="drawingLimit"
+        :headers="headers"
+        :before-upload="handleBeforeUpload"
+        :http-request="httpRequest"
+        :on-exceed="handleExceed"
+        :file-list="fileList"
+      >
+        <i slot="default" class="el-icon-plus"></i>
+        <div slot="file" slot-scope="{file}">
+          <img
+            v-if="isAssetTypeAnImage(file.name)"
+            :alt="file.name"
+            :src="file.url" class="el-upload-list__item-thumbnail"
+          >
+          <span v-else>{{ file.name }}</span>
+          <span class="el-upload-list__item-actions">
+        <span
+          v-if="isAssetTypeAnImage(file.name)"
+          class="el-upload-list__item-preview"
+          @click="handlePictureCardPreview(file)"
+        >
+          <i class="el-icon-zoom-in"></i>
+        </span>
+        <span
+          class="el-upload-list__item-delete"
+          @click="handleDownload(file)"
+        >
+          <i class="el-icon-download"></i>
+        </span>
+        <span
+          class="el-upload-list__item-delete"
+          @click="handleRemoveDrawing(file)"
+          v-if="addProductPlanObject.planStatus === PLAN_STATUS.DISPATCHED"
+        >
+          <i class="el-icon-delete"></i>
+        </span>
+      </span>
+        </div>
+      </el-upload>
+      <span slot="footer" class="dialog-footer">
+        <!-- 上传提示 -->
+    <el-button type="primary" @click="drawingFileUploadSubmit">确 定</el-button>
+    <el-button @click="blueprintModel = false">取 消</el-button>
+      </span>
+    </el-dialog>
+
+    <el-dialog
+      :visible.sync="sopViewModel"
+      title="上传SOP附件"
+      width="30%"
+      @before-close="sopViewModel = false">
+      <el-form ref="form">
+        <el-form-item label="选择BOM的SOP">
+          <el-select v-model="materialBomAttachIdList"  placeholder="请选择选择BOM的SOP" multiple filterable :clearable="false"
+                     :disabled="(addProductPlanObject.planStatus !== PLAN_STATUS.DISPATCHED)">
+            <el-option
+              v-for="item in attachInfoList"
+              :key="item.attachId"
+              :label="item.attachName"
+              :value="item.attachId"
+              :disabled="isOptionDisabled(item.attachId)"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <el-upload
+        single
+        ref="drawingUpload"
+        list-type="picture-card"
+        action="uploadImgUrl"
+        :auto-upload="true"
+        :limit="sopLimit"
+        :headers="headers"
+        :before-upload="handleBeforeUpload"
+        :http-request="httpSopRequest"
+        :on-exceed="handleExceed"
+        :file-list="fileList"
+      >
+        <i slot="default" class="el-icon-plus"></i>
+        <div slot="file" slot-scope="{file}">
+          <img
+            v-if="isAssetTypeAnImage(file.name)"
+            :alt="file.name"
+            :src="file.url" class="el-upload-list__item-thumbnail"
+          >
+          <span v-else>{{ file.name }}</span>
+          <span class="el-upload-list__item-actions">
+        <span
+          v-if="isAssetTypeAnImage(file.name)"
+          class="el-upload-list__item-preview"
+          @click="handlePictureCardPreview(file)"
+        >
+          <i class="el-icon-zoom-in"></i>
+        </span>
+        <span
+          class="el-upload-list__item-delete"
+          @click="handleDownload(file)"
+        >
+          <i class="el-icon-download"></i>
+        </span>
+        <span
+          class="el-upload-list__item-delete"
+          @click="handleRemoveSop(file)"
+          v-if="addProductPlanObject.planStatus === PLAN_STATUS.DISPATCHED"
+        >
+          <i class="el-icon-delete"></i>
+        </span>
+      </span>
+        </div>
+      </el-upload>
+      <span slot="footer" class="dialog-footer">
+        <!-- 上传提示 -->
+<!--    <div class="el-upload__tip" slot="tip" v-if="isShowTip">-->
+<!--      请上传-->
+<!--      <template v-if="sopFileSize"> 大小不超过 <b style="color: #f56c6c">{{ sopFileSize }}MB</b></template>-->
+<!--      <template v-if="sopFileType"> 格式为 <b style="color: #f56c6c">{{ sopFileType.join("/") }}</b></template>-->
+<!--      的文件-->
+<!--    </div>-->
+    <el-button type="primary" @click="sopFileUploadSubmit">确 定</el-button>
+    <el-button @click="sopViewModel = false">取 消</el-button>
+      </span>
+    </el-dialog>
+
+    <el-dialog
+      :visible.sync="pictureDetailModel"
+      title="图纸预览"
+      width="800"
+      append-to-body
+    >
+      <img
+        :src="dialogImageUrl"
+        style="display: block; max-width: 100%; margin: 0 auto"
+      />
+    </el-dialog>
+
+
+    <!-- 投料信息对话框 -->
+    <el-dialog title="投料" :visible.sync="applyRawOutstockOpen" append-to-body>
+      <apply-raw-outstock ref="applyRawOutstockRef" :defineData="productPlanData"
+                          v-if="applyRawOutstockOpen"></apply-raw-outstock>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+// import {getProductOrder} from "@//api/mes/productOrder";
+// import {
+//   deleteProductPlansByDispatchCode,
+//   getDispatchCode,
+//   selectProductPlans,
+//   checkAddMesProductPlanList,
+//   orderAddMesProductPlanList,
+//   getBaseRouteProcesses,
+//   getProcessUsers,
+//   uploadFile, getAttachInfoList
+// } from "@//api/mes/productplan";
+// import {getConfigKey} from "@//api/system/config"
+// import {deepClone} from "@//utils/index";
+// import {getToken} from "@//utils/auth";
+// import {getBomAttachInfo, listMaterialBom} from "@/api/mes/materialBom";
+// import {listMaterialinfo} from "@/api/mes/materialinfo";
+
+let id = 0
+let deepSearch = (arr, target) => {
+  let results = []
+  arr.forEach(element => {
+    console.log(element)
+    id = Math.max(id, element.id)
+    if (element.id === target) {
+      results.push(element)
+    } else if (Array.isArray(element.children)) {
+      results = results.concat(deepSearch(element.children, target))
+    }
+    // if (Array.isArray(element.children)) {
+    //   results = results.concat(deepSearch(element.children, target))
+    // } else if (element.id === target) {
+    //   results.push(element)
+    // }
+  })
+  return results
+}
+
+
+export default {
+  name: "productPlanEdit",
+  dicts: ['plan_status', 'product_status', 'mes_dispatch_flag'],
+  provide() {
+    return {
+      closeRawOutstockDialog: this.closeRawOutstockDialog,
+    }
+  },
+  props: {
+    value: [String, Object, Array, Number],
+    // sop文件数量限制
+    sopLimit: {
+      type: Number,
+      default: 20,
+    },
+    // 图纸数量限制
+    drawingLimit: {
+      type: Number,
+      default: 20,
+    },
+
+    // 是否显示提示
+    isShowTip: {
+      type: Boolean,
+      default: true
+    }
+  },
+  data() {
+    return {
+      blueprintModel: false,
+      sopViewModel: false,
+      pictureDetailModel: false,
+      // 图片预览地址
+      dialogImageUrl: '',
+      // 非单个禁用
+      single: true,
+      checkedMesProductPlanList: [],
+      // 上传的文件服务器地址
+      uploadImgUrl: import.meta.env.VUE_APP_BASE_API,
+      uploadDrawingUrl: import.meta.env.VUE_APP_BASE_API + "/file/upload2SharePath",
+      // 选中选项卡的 name
+      activeName: "columnInfo",
+      // 表格的高度
+      tableHeight: document.documentElement.scrollHeight - 245 + "px",
+      // 表信息
+      tables: [],
+      // 表列信息
+      columns: [],
+      // 生产计划表格数据
+      mesProductPlanList: [],
+      //待删除的生产计划ID
+      toDeletedPlanIds: [],
+
+      applyRawOutstockOpen: false,
+      productPlanData: {},
+      // 表详细信息
+      info: {},
+      // 表单参数
+      form: {},
+      //自动化工序标识（2楼和3楼）
+      autoProcessFlag: false,
+      // 表单校验
+      rules: {
+        productOrderId: [
+          {required: true, message: "生产工单ID不能为空", trigger: "blur"}
+        ],
+        planCode: [
+          {required: true, message: "计划编号不能为空", trigger: "blur"}
+        ],
+        dispatchCode: [
+          {required: true, message: "派工单号不能为空", trigger: "blur"}
+        ],
+        materialId: [
+          {required: true, message: "物料ID不能为空", trigger: "blur"}
+        ],
+        materialBomId: [
+          {required: true, message: "物料bomID不能为空", trigger: "blur"}
+        ],
+        stationId: [
+          {required: true, message: "工位ID不能为空", trigger: "blur"}
+        ],
+        planStatus: [
+          {required: true, message: "计划状态不能为空", trigger: "change"}
+        ],
+        isFlag: [
+          {required: true, message: "是否标识不能为空", trigger: "change"}
+        ],
+      },
+      // 文件列表
+      fileList: [],
+      // 根据工序和派工单号分组Sop文件
+      groupSopFile: {},
+      // 根据工序和派工单号分组Sop文件列表
+      groupSopFileList: {},
+      // 上传SOP文件回调列表
+      uploadSopList: [],
+
+      // 根据工序和派工单号分组图纸文件
+      groupAttachFile: {},
+      // 根据工序和派工单号分组图纸文件列表
+      groupAttachFileList: {},
+      // 上传图纸文件回调列表
+      uploadAttachList: {},
+
+      previewSopFlag: {},//是否预览过SOP
+      previewDrawingFlag: {},//是否预览过图纸
+
+      // SOP文件大小限制(MB)
+      sopFileSize: 50,
+      // SOP文件类型,
+      sopFileType: ["png", "jpg", "jpeg"],
+
+      // 图纸文件大小限制(MB)
+      drawingFileSize: 50,
+      // 图纸文件类型, 例如['png', 'jpg', 'jpeg']
+      drawingFileType: ["dxf", "dwg"],
+
+      //文件上传-生产派工对象
+      addProductPlanObject: {},
+      headers: {
+        Authorization: "Bearer "  ,
+      },
+      PROCESS_ID: {
+        BENDING_PROCESS_ID: 42
+      },
+      PROCESS_TYPE: {
+        MANUAL: '1',
+        AUTO: '3',
+      },
+      DISPLAY_FLAG: {
+        YES: '1',
+        NO: '0',
+      },
+      PLAN_STATUS: {
+        TO_DISPATCH: '0',//待派工
+        DISPATCHED: '1',//已派工
+        STARTED: '2',//已开始
+        FINISHED: '3' //已完成
+
+      },
+      ORDER_STATUS: {
+        TO_PUBLISHED: '0',//待发布
+        PUBLISHED: '1',//已发布
+        FINISHED: '2',//已完成
+        STARTED: '3',//已开始
+        PAUSE: '4',//已暂停
+        RECALLED: '8',//已撤回
+        DELETED: '9',//已删除
+      },
+      SALE_TYPE: {
+        INTERNAL: '2',//对内生产
+      },
+      id: 1,
+      ATTACH_TYPE: {
+        DRAWING: "1",//附件类别:加工图纸
+        SOP: "2",//附件类别:SOP
+      },
+      processUsers: [],
+      //物料BOMList
+      attachInfoList: [],
+      //选中的BOMList
+      materialBomAttachIdList: [],
+    };
+  },
+  watch: {
+    'materialBomAttachIdList': {
+      handler(newVal, oldVal)  {
+        this.updateAttachInfoByBom(newVal, oldVal);
+      },
+    }
+  },
+  created() {
+    // const productOrderId = this.$route.params && this.$route.params.productOrderId;
+    // if (productOrderId) {
+    //   // 获取表详细信息
+    //   getProductOrder(productOrderId).then(res => {
+    //     this.form = res.data;
+    //     this.getProcessUsers(productOrderId);
+    //   });
+    // }
+    //
+    //
+    // this.getConfigValues();
+  },
+  methods: {
+    getConfigValues(){
+      //图纸支持格式
+      getConfigKey("mes.drawing.allowedExtension").then(res => {
+        if(res.msg){
+          this.drawingFileType = res.msg.split(",");
+        }
+      });
+
+      getConfigKey("mes.drawing.maxSize").then(res => {
+        if(res.msg){
+          this.drawingFileSize = res.msg;
+        }
+      });
+
+      getConfigKey("mes.sop.allowedExtension").then(res => {
+        if(res.msg){
+          this.sopFileType = res.msg.split(",");
+        }
+      });
+
+      getConfigKey("mes.sop.maxSize").then(res => {
+        if (res.msg) {
+          this.sopFileSize = res.msg;
+        }
+      });
+
+    },
+
+    getProcessUsers(productOrderId) {
+      getProcessUsers(this.form.dispatchId).then(res => {
+        res.data.forEach(processUser => {
+          if (!this.processUsers[processUser.processId]) {
+            this.processUsers[processUser.processId] = [];
+          }
+          this.processUsers[processUser.processId].push(processUser);
+        });
+
+        selectProductPlans({productOrderId: productOrderId}).then(res => {
+          this.groupProductPlans(res.data)
+          // res.data.forEach(e => {
+          //   // 新添加列标识 false=新添加，true=历史行
+          //   e.oldRowFlag = true;
+          //   this.mesProductPlanList.push(e);
+          // })
+        })
+      });
+    },
+
+    groupProductPlans(productPlans) {
+      const groupedProductPlans = {};
+      productPlans.forEach(productPlan => {
+        const key = `${productPlan.dispatchCode}-${productPlan.processId}`;
+        if (!groupedProductPlans[key]) {
+          groupedProductPlans[key] = [];
+        }
+        groupedProductPlans[key].push(productPlan);
+      });
+
+      let firstDispatch = {};
+
+      for (let dispatchCodeProcessId in groupedProductPlans) {
+        let productPlansByDispatch = groupedProductPlans[dispatchCodeProcessId];
+
+        // console.log(processId + ": " + JSON.stringify(groupedProductPlans[processId]));
+        let obj = {};
+
+        //每个派工单第一个工序才显示删除按钮
+        let dispatchCode = dispatchCodeProcessId.split("-")[0];
+        if (!firstDispatch[dispatchCode]) {
+          firstDispatch[dispatchCode] = "1";
+          obj.firstFlag = "1";
+        }
+
+        obj.id = this.id
+        this.id = this.id + 1;
+        obj.addFlag = "0";
+        let i = 0;
+        let processType;
+        productPlansByDispatch.forEach(groupedProductPlan => {
+          if (groupedProductPlan.planStatus !== this.PLAN_STATUS.FINISHED) {
+            obj.addFlag = "1";
+          }
+
+          processType = groupedProductPlan.processType;
+          groupedProductPlan.id = this.id;
+          this.id = this.id + 1;
+          groupedProductPlan.productionTime = parseFloat((groupedProductPlan.productionTime / 60 / 60).toFixed(1));
+          obj.sopId = groupedProductPlan.sopId;
+          obj.attachId = groupedProductPlan.attachId;
+          obj.productionTime = parseFloat((groupedProductPlan.processProductionTime / 60 / 60).toFixed(1));
+
+          if (i === 0 || groupedProductPlan.processType !== this.PROCESS_TYPE.MANUAL) {
+            obj.dispatchCode = groupedProductPlan.dispatchCode;
+            obj.planCode = groupedProductPlan.planCode;
+            obj.dispatchAmount = groupedProductPlan.dispatchAmount;
+            obj.processId = groupedProductPlan.processId;
+            obj.processName = groupedProductPlan.processName;
+            obj.lastProcessId = groupedProductPlan.lastProcessId;
+            obj.processType = groupedProductPlan.processType;
+            obj.processOrder = groupedProductPlan.processOrder;
+            obj.displayFlag = groupedProductPlan.displayFlag;
+            obj.finalProcessFlag = groupedProductPlan.finalProcessFlag;
+            obj.attachId = groupedProductPlan.attachId;
+            obj.sopId = groupedProductPlan.sopId;
+
+            obj.planBeginTime = this.form.planBeginTime;
+            obj.planEndTime = this.form.planEndTime;
+            obj.planStatus = groupedProductPlan.planStatus;
+            // obj.dispatchAmount = this.form.planAmount - this.form.dispatchAmount;
+
+            obj.materialId = this.form.materialId;
+            obj.materialBomId = this.form.materialBomId;
+            obj.productOrderId = this.form.productOrderId;
+            obj.saleOrderId = this.form.saleOrderId;
+            obj.saleorderCode = this.form.saleorderCode;
+            // 新添加列标识 false=新添加，true=历史行
+            obj.oldRowFlag = true;
+
+            if (groupedProductPlan.processType !== this.PROCESS_TYPE.MANUAL) {
+              let cloneObj = deepClone(obj);
+              cloneObj.id = this.id
+              cloneObj.planId = groupedProductPlan.planId;
+              cloneObj.productionTime = parseFloat((groupedProductPlan.productionTime / 60 / 60).toFixed(1));
+              this.id = this.id + 1;
+              cloneObj.children = [];
+              this.mesProductPlanList.push(cloneObj);
+            }
+            i++;
+          }
+        });
+
+        if (processType === this.PROCESS_TYPE.MANUAL) {
+          obj.children = productPlansByDispatch;
+          this.mesProductPlanList.push(obj);
+        }
+      }
+
+      this.getId(this.mesProductPlanList);
+      console.log(this.mesProductPlanList)
+
+    },
+
+    getId(arr) {
+      arr.forEach(element => {
+        this.id = this.id + 1;
+        if (Array.isArray(element.children)) {
+          this.getId(element.children)
+        }
+      })
+    },
+
+    addProcessUser(scope) {
+      let finishStatus = this.PLAN_STATUS.FINISHED
+      const filterPlanList = this.mesProductPlanList.filter(function (item) {
+        return scope.row.dispatchCode + "-" + scope.row.processId === item.dispatchCode + "-" + item.processId
+          && item.planStatus !== finishStatus;
+      })
+
+      if (filterPlanList.length <= 0) {
+        this.$modal.msgError("此工序已经完成，不能添加");
+        return;
+      }
+
+      let data = deepSearch(this.mesProductPlanList, scope.row.id)?.[0]
+      let id = this.id + 1
+      this.id += 1;
+      if (Array.isArray(data.children)) {
+
+        this.$set(data.children, data.children.length, {
+          id: id,
+          dispatchCode: scope.row.dispatchCode,
+          processId: scope.row.processId,
+          productionTime: scope.row.productionTime,
+          materialBomId: scope.row.materialBomId,
+          planStatus: this.PLAN_STATUS.DISPATCHED,
+          userId: null
+        })
+      } else {
+        this.$set(data, 'children', [
+          {
+            id: id,
+            dispatchCode: scope.row.dispatchCode,
+            processId: scope.row.processId,
+            productionTime: scope.row.productionTime,
+            materialBomId: scope.row.materialBomId,
+            planStatus: this.PLAN_STATUS.DISPATCHED,
+            userId: null,
+          }
+        ])
+      }
+
+
+      this.id += 1
+      // this.show = false
+      // this.show = true
+    },
+
+
+    isAssetTypeAnImage(ext) {
+      let suffix = ext.lastIndexOf(".");
+      let name = ext.substr(suffix + 1);
+      return ['png', 'jpg', 'jpeg'].includes(name.toLowerCase())
+    },
+    /** 提交按钮 */
+    submitForm() {
+      // let dataList = this.mesProductPlanList.filter(plan => !plan.oldRowFlag);
+      if (this.mesProductPlanList.length === 0) {
+        this.$modal.msgError("无派工信息提交");
+        return;
+      }
+
+      let dataList = this.mesProductPlanList;
+      let toUpdatedProductPlans = [];
+      let undispathDesc;
+      let currentDispatchAmount = 0;
+      let planDispatchAmount = 0;
+      for (let i = 0; i < dataList.length; i++) {
+        let e = dataList[i];
+
+        if (e.firstFlag && e.firstFlag === "1") {//第一个标识，校验派工数量
+          let dispatchAmount = e.dispatchAmount;
+          const numericAmount = parseInt(dispatchAmount, 10);
+          if (!this.isPositiveInteger(numericAmount) || numericAmount <= 0) {
+            this.$modal.msgError("派工数量须为大于等于0的正整数！");
+            return;
+          }
+
+          planDispatchAmount = numericAmount;
+          if (e.newFlag && e.newFlag === "1") {
+            currentDispatchAmount += numericAmount;
+          }
+        }
+
+
+        let dispatchFlag = false;
+        undispathDesc = "派工单号为[" + e.dispatchCode + "]，工序为[" + e.processName + "],请选择用户派工";
+        if (e.processType !== this.PROCESS_TYPE.AUTO) {
+          if (!e.children || e.children.length <= 0) {//不是自动话产线需要派工到人
+            this.$modal.msgError(undispathDesc);
+            return;
+          }
+
+          for (let j = 0; j < e.children.length; j++) {
+            let processUser = e.children[j];
+            let toUpdatedProductPlan = deepClone(e);
+
+            if (processUser.userId && processUser.userId !== '') {
+              toUpdatedProductPlan.userId = processUser.userId;
+              if (processUser.planBeginTime && processUser.planBeginTime !== '' &&
+                (processUser.planBeginTime < this.form.planBeginTime || processUser.planBeginTime > this.form.planEndTime)){
+                this.$modal.msgError("序号" + (parseInt(e.index) + 1) + "：计划开始时间不在生产工单时间范围内");
+                return;
+              }
+              if (processUser.planEndTime && processUser.planEndTime !== '' &&
+                (processUser.planEndTime < this.form.planBeginTime || processUser.planEndTime > this.form.planEndTime)) {
+                this.$modal.msgError("序号" + (parseInt(e.index) + 1) + "：计划结束时间不在生产工单时间范围内");
+                return;
+              }
+
+              if (processUser.planBeginTime && processUser.planBeginTime !== '' &&
+                processUser.planEndTime && processUser.planEndTime !== '' &&
+                processUser.planBeginTime >= processUser.planEndTime) {
+                this.$modal.msgError("序号" + (parseInt(e.index) + 1) + "：计划开始时间须小于计划结束时间");
+                return;
+              }
+              toUpdatedProductPlan.planBeginTime = processUser.planBeginTime;
+              toUpdatedProductPlan.planEndTime = processUser.planEndTime;
+              toUpdatedProductPlan.planId = processUser.planId;
+              toUpdatedProductPlan.planStatus = processUser.planStatus;
+              toUpdatedProductPlan.attachId = processUser.attachId;
+              toUpdatedProductPlan.sopId = processUser.sopId;
+              toUpdatedProductPlan.planAmount = planDispatchAmount;
+              toUpdatedProductPlan.dispatchAmount = planDispatchAmount;
+              toUpdatedProductPlan.children = null;
+              let productionTimeHour = processUser.productionTime;
+
+              let productionTimeSecond = productionTimeHour * 60 * 60;
+              toUpdatedProductPlan.productionTime = productionTimeSecond;
+
+              toUpdatedProductPlans.push(toUpdatedProductPlan);
+              dispatchFlag = true;
+            } else {
+              this.$modal.msgError(undispathDesc);
+              return;
+            }
+          }
+        } else {
+          toUpdatedProductPlans.push(e);
+        }
+
+        if (toUpdatedProductPlans.length <= 0) {
+          this.$modal.msgError("无派工信息提交");
+          return;
+        }
+
+
+      }
+
+      //校验派工数量是否大于生产任务计划数量
+      let dispatchedAmount = this.form.dispatchAmount + currentDispatchAmount;//加上此次派工的数量，总共的派工数量
+      if (dispatchedAmount > this.form.planAmount) {
+        this.$modal.msgError("派工数量之和需小于等于该生产任务计划数量！");
+        return;
+      }
+
+
+      checkAddMesProductPlanList(
+        {
+          productOrderId: this.form.productOrderId,
+          dispatchAmount: currentDispatchAmount,
+          saleOrderId: this.form.saleOrderId,
+          mesProductPlanList: toUpdatedProductPlans,
+        })
+        .then(res => {
+          if (res?.msg && res.msg !== '') {
+            this.$modal.confirm('有以下用户派工冲突，请确认是否继续派工?' + res.msg).then(function () {
+              orderAddMesProductPlanList(currentDispatchAmount, toUpdatedProductPlans);
+              return true;
+            }).then(() => {
+            }).catch(() => {
+            });
+
+          } else {
+            this.orderAddMesProductPlanList(currentDispatchAmount, toUpdatedProductPlans);
+          }
+
+        });
+
+
+    },
+
+    orderAddMesProductPlanList(currentDispatchAmount, toUpdatedProductPlans) {
+      orderAddMesProductPlanList(
+        {
+          productOrderId: this.form.productOrderId,
+          dispatchAmount: currentDispatchAmount,
+          mesProductPlanList: toUpdatedProductPlans,
+          toDeletedPlanIds: this.toDeletedPlanIds
+        })
+        .then(res => {
+          this.$modal.msgSuccess(res.msg);
+          this.close();
+        });
+    },
+
+
+    /** 删除按钮操作 */
+    handleDeleteMesProductPlan(scope) {
+      let dispatchCode = scope.row.dispatchCode;
+      this.$modal.confirm('是否确认删除生产派工单号为"' + dispatchCode + '"的数据项？').then(function () {
+        return true;
+      }).then(() => {
+        if (this.form.orderStatus === this.ORDER_STATUS.RECALLED) {
+          this.$modal.msgError("此生产任务已经撤回，不能删除");
+          return;
+        }
+
+        if (this.form.orderStatus === this.ORDER_STATUS.FINISHED) {
+          this.$modal.msgError("此生产任务已经完成，不能删除");
+          return;
+        }
+
+        if (this.form.orderStatus === this.ORDER_STATUS.DELETED) {
+          this.$modal.msgError("此生产任务已经删除，不能删除");
+          return;
+        }
+
+
+        if (scope.row.newFlag != null || scope.row.newFlag === '1') {
+          //新增删除
+          this.mesProductPlanList = this.mesProductPlanList.filter(function (item) {
+            return scope.row.dispatchCode !== item.dispatchCode
+          });
+        } else {
+          //历史删除
+          let dispatchSum = 0; //需要减去的派工数量
+          try {
+            const planIds = this.mesProductPlanList.filter(function (item) {
+              return scope.row.dispatchCode === item.dispatchCode
+            }).map(item => {
+              if (item.planStatus !== this.PLAN_STATUS.DISPATCHED && item.planStatus !== this.PLAN_STATUS.TO_DISPATCH) {
+                throw Error("只能删除还未开始过状态的生产派工单！");
+              }
+
+              dispatchSum = item.dispatchAmount;//派工数量每一个工序都一样
+              return item.planId;
+            });
+
+            deleteProductPlansByDispatchCode({
+              productOrderId: this.form.productOrderId,
+              dispatchCode: dispatchCode,
+              dispatchAmount: dispatchSum
+            }).then(res => {
+              this.mesProductPlanList = this.mesProductPlanList.filter(function (item) {
+                return dispatchCode !== item.dispatchCode
+              });
+              this.form.dispatchAmount = this.form.dispatchAmount - dispatchSum;
+              this.$modal.msgSuccess("删除成功");
+
+            });
+
+
+          } catch (e) {
+            this.$modal.msgError(e);
+          }
+        }
+      }).catch(() => {
+      });
+    },
+    /** 生产计划明细序号 */
+    rowMesProductPlanIndex({row, rowIndex}) {
+      row.index = rowIndex + 1;
+    },
+    /** 复选框选中数据 */
+    handleMesProductPlanSelectionChange(selection) {
+      this.checkedMesProductPlanList = selection
+      this.single = selection.length !== 1
+    },
+    /** 关闭按钮 */
+    close() {
+      const obj = {path: "/mes/plan/productOrder", query: {t: Date.now(), queryParams: this.$route.query.queryParams}};
+      this.$tab.closeOpenPage(obj);
+    },
+
+
+    /** 生产计划添加按钮操作 */
+    handleAddMesProductPlan() {
+      let dispatchCode = "";
+      getDispatchCode().then(res => {
+        dispatchCode = res.msg;
+        getBaseRouteProcesses({routeId: this.form.dispatchId}).then(res => {
+          // if (res.data.length === 0) {
+          //   this.$modal.msgError("工艺路线未维护工位信息！");
+          // }
+          let lastProcessId = null;
+          let i = 0;
+          res.data.forEach((e, index) => {
+            let obj = {};
+            if (i === 0) {
+              obj.firstFlag = "1";//设置第一条标识，代表只能此派工单号只有第一条记录上有删除按钮，删除时同意删除此派工单号的派工，第一条有派工数量即可
+              i++;
+            }
+            obj.id = this.id
+            this.id = this.id + 1;
+            obj.dispatchCode = dispatchCode;
+            obj.processId = e.processId;
+            obj.processName = e.processName;
+            obj.processType = e.processType;
+            obj.processOrder = e.processOrder;
+            obj.finalProcessFlag = e.finalProcessFlag;
+            obj.productionTime = e.productionTime ? parseFloat((e.productionTime / 60 / 60).toFixed(1)) : 0;
+
+            obj.planBeginTime = this.form.planBeginTime;
+            obj.planEndTime = this.form.planEndTime;
+            obj.planStatus = '1';
+            // obj.dispatchAmount = this.form.planAmount - this.form.dispatchAmount;
+            obj.dispatchFlag = null;
+
+            if (this.form.saleType === this.SALE_TYPE.INTERNAL) {
+              obj.materialId = this.form.produceMaterialId;
+            } else {
+              obj.materialId = this.form.materialId;
+            }
+
+            obj.materialBomId = this.form.materialBomId;
+            obj.productOrderId = this.form.productOrderId;
+            obj.saleOrderId = this.form.saleOrderId;
+            obj.saleorderCode = this.form.saleorderCode;
+
+            obj.newFlag = "1";//代表新增
+            obj.addFlag = "1";
+
+            // e.mesBaseProcessUserList.forEach((mesBaseProcessUser, index) => {
+            //   mesBaseProcessUser.id = this.id + 1;
+            //   mesBaseProcessUser.dispatchFlag = null;
+            //   mesBaseProcessUser.planBeginTime = null;
+            //   mesBaseProcessUser.planEndTime = null;
+            //   this.id = this.id + 1;
+            // });
+
+            if (e.processType === this.PROCESS_TYPE.AUTO) {
+              obj.children = [];
+            } else {
+              obj.children = [{
+                id: this.id,
+                dispatchCode: obj.dispatchCode,
+                processId: obj.processId,
+                materialBomId: obj.materialBomId,
+                planStatus: this.PLAN_STATUS.DISPATCHED,
+                productionTime: obj.productionTime,
+                userId: null
+              }]
+            }
+
+
+            this.id += 1;
+
+            // 上一工序ID
+            if (lastProcessId == null) {
+              obj.lastProcessId = 0;
+            } else if (lastProcessId === obj.processId) {
+              obj.lastProcessId = this.mesProductPlanList[index - 1].lastProcessId;
+            } else {
+              obj.lastProcessId = lastProcessId;
+            }
+            lastProcessId = e.processId;
+            // 新添加列标识 false=新添加，true=历史行
+            obj.oldRowFlag = false;
+            this.mesProductPlanList.push(obj);
+          })
+
+          this.getId(this.mesProductPlanList)
+        })
+      })
+    },
+
+
+    isPositiveInteger(value) {
+      // 使用正则表达式匹配正整数
+      return /^[0-9]\d*$/.test(value);
+    },
+    //查看图纸预览
+    handlePictureCardPreview(file) {
+      this.dialogImageUrl = file.url;
+      this.pictureDetailModel = true;
+    },
+    //图纸下载
+    handleDownload(file) {
+      window.open(file.url);
+    },
+
+
+    /** 查看图纸 */
+    handleDrawing(row) {
+      this.fileList = [];
+      if (row.planId != null && (!this.previewDrawingFlag[row.dispatchCode + "-" + row.processId + "-" + row.userId]
+        || this.previewDrawingFlag[row.dispatchCode + "-" + row.processId + "-" + row.userId] !== "1")) {
+        this.previewDrawingFlag[row.dispatchCode + "-" + row.processId + "-" + row.userId] = "1";
+        getAttachInfoList(this.ATTACH_TYPE.DRAWING, row.dispatchCode, row.processId, row.userId).then(res => {
+          let attachList = res.data;
+          attachList.forEach(e => {
+            let previewFile = {};
+            previewFile.url = e.attachPath;
+            previewFile.name = e.attachName;
+            this.fileList.push(previewFile);
+
+            let groupAttachFile = {};
+            groupAttachFile.dispatchCode = row.dispatchCode;
+            groupAttachFile.processId = row.processId;
+            groupAttachFile.attachId = e.attachId;
+            groupAttachFile.attachPath = e.attachPath;
+            groupAttachFile.attachName = e.attachName;
+            let groupAttachFileList = this.groupAttachFileList[this.addProductPlanObject.dispatchCode + "-" + this.addProductPlanObject.processId + "-" + this.addProductPlanObject.userId];
+            this.groupAttachFileList[this.addProductPlanObject.dispatchCode + "-" + this.addProductPlanObject.processId + "-" + this.addProductPlanObject.userId] = groupAttachFileList ? this.groupAttachFileList[this.addProductPlanObject.dispatchCode + "-" + this.addProductPlanObject.processId + "-" + this.addProductPlanObject.userId] : [];
+            this.groupAttachFileList[this.addProductPlanObject.dispatchCode + "-" + this.addProductPlanObject.processId + "-" + this.addProductPlanObject.userId].push(groupAttachFile);
+
+            let uploadAttachList = this.uploadAttachList[this.addProductPlanObject.dispatchCode + "-" + this.addProductPlanObject.processId + "-" + this.addProductPlanObject.userId];
+            this.uploadAttachList[this.addProductPlanObject.dispatchCode + "-" + this.addProductPlanObject.processId + "-" + this.addProductPlanObject.userId] = uploadAttachList ? this.uploadAttachList[this.addProductPlanObject.dispatchCode + "-" + this.addProductPlanObject.processId + "-" + this.addProductPlanObject.userId] : [];
+            this.uploadAttachList[this.addProductPlanObject.dispatchCode + "-" + this.addProductPlanObject.processId + "-" + this.addProductPlanObject.userId].push(e.attachId);
+
+          })
+        })
+      } else {
+        if (this.groupAttachFileList[row.dispatchCode + "-" + row.processId + "-" + row.userId]) {
+          this.groupAttachFileList[row.dispatchCode + "-" + row.processId + "-" + row.userId].forEach(e => {
+            let previewFile = {};
+            previewFile.url = e.attachPath;
+            previewFile.name = e.attachName;
+            this.fileList.push(previewFile);
+          })
+        }
+      }
+
+      this.addProductPlanObject = row;
+      this.materialBomAttachIdList = [];
+      getBomAttachInfo(this.ATTACH_TYPE.DRAWING, this.addProductPlanObject.materialBomId).then(response => {
+        this.attachInfoList = response.data;
+        for (let e of this.fileList) {
+          let attachInfo = this.attachInfoList.find(item => item.attachPath === e.url);
+          if (attachInfo != null){
+            this.materialBomAttachIdList.push(attachInfo.attachId);
+          }
+        }
+        this.blueprintModel = true;
+      });
+    },
+
+    //添加图纸提交
+    drawingFileUploadSubmit() {
+      for (let i = 0; i < this.mesProductPlanList.length; i++) {
+        let mesProductPlan = this.mesProductPlanList[i];
+        for (let child of mesProductPlan.children) {
+          if (mesProductPlan.dispatchCode === this.addProductPlanObject.dispatchCode
+            && mesProductPlan.processId === this.addProductPlanObject.processId
+            && child.userId === this.addProductPlanObject.userId) {
+            child.attachId = this.uploadAttachList[this.addProductPlanObject.dispatchCode + "-" + this.addProductPlanObject.processId + "-" + this.addProductPlanObject.userId].join(",");
+          }
+        }
+      }
+      // this.uploadAttachList = [];
+      this.addProductPlanObject = {};
+      this.blueprintModel = false;
+    },
+
+
+    //图纸图片上传
+    httpRequest(file) {
+      // 文件信息
+      const fileData = file.file;
+      const formData = new FormData();
+      formData.append("file", fileData);
+      formData.append("processId", this.addProductPlanObject.processId);
+      formData.append("attachType", this.ATTACH_TYPE.DRAWING);
+      uploadFile(formData).then(
+        (res) => {
+          let uploadAttachList = this.uploadAttachList[this.addProductPlanObject.dispatchCode + "-" + this.addProductPlanObject.processId + "-" + this.addProductPlanObject.userId];
+          this.uploadAttachList[this.addProductPlanObject.dispatchCode + "-" + this.addProductPlanObject.processId + "-" + this.addProductPlanObject.userId] = uploadAttachList ? this.uploadAttachList[this.addProductPlanObject.dispatchCode + "-" + this.addProductPlanObject.processId + "-" + this.addProductPlanObject.userId] : [];
+          this.uploadAttachList[this.addProductPlanObject.dispatchCode + "-" + this.addProductPlanObject.processId + "-" + this.addProductPlanObject.userId].push(res.attachId);
+
+          // 存储附件信息主键
+          let groupAttachFile = {};
+          groupAttachFile.dispatchCode = this.addProductPlanObject.dispatchCode;
+          groupAttachFile.processId = this.addProductPlanObject.processId;
+          groupAttachFile.attachId = res.attachId;
+          groupAttachFile.attachPath = res.imgUrl;
+          groupAttachFile.attachName = res.fileName;
+          let groupAttachFileList = this.groupAttachFileList[this.addProductPlanObject.dispatchCode + "-" + this.addProductPlanObject.processId + "-" + this.addProductPlanObject.userId];
+          this.groupAttachFileList[this.addProductPlanObject.dispatchCode + "-" + this.addProductPlanObject.processId + "-" + this.addProductPlanObject.userId] = groupAttachFileList ? this.groupAttachFileList[this.addProductPlanObject.dispatchCode + "-" + this.addProductPlanObject.processId + "-" + this.addProductPlanObject.userId] : [];
+          this.groupAttachFileList[this.addProductPlanObject.dispatchCode + "-" + this.addProductPlanObject.processId + "-" + this.addProductPlanObject.userId].push(groupAttachFile);
+          this.$modal.closeLoading();
+        }, (err) => {
+          this.$refs.drawingUpload.clearFiles();  //上传失败后清除当前上传的图片
+          this.$modal.closeLoading();
+        }
+      );
+    },
+
+    //删除上传的图片
+    handleRemoveDrawing(file) {
+      let arrPic = this.$refs.drawingUpload.uploadFiles;
+      let index = arrPic.indexOf(file);
+      this.uploadAttachList[this.addProductPlanObject.dispatchCode + "-" + this.addProductPlanObject.processId + "-" + this.addProductPlanObject.userId].splice(index, 1);
+      // this.uploadAttachList.splice(index, 1);
+      this.fileList.splice(index, 1);
+      this.groupAttachFileList[this.addProductPlanObject.dispatchCode + "-" + this.addProductPlanObject.processId + "-" + this.addProductPlanObject.userId].splice(index, 1);
+      let num = 0;
+      arrPic.map((item) => {
+        if (item.uid === file.uid) {
+          arrPic.splice(num, 1);
+        }
+        num++;
+      });
+      let attachInfo = this.attachInfoList.find(item => item.attachPath === file.url);
+      if (attachInfo != null){
+        this.materialBomAttachIdList = this.materialBomAttachIdList.filter(item => item !== attachInfo.attachId);
+      }
+    },
+
+
+    /** 查看sop */
+    handleSop(row) {
+      this.fileList = [];
+      if (row.planId != null && (!this.previewSopFlag[row.dispatchCode + "-" + row.processId + "-" + row.userId]
+        || this.previewSopFlag[row.dispatchCode + "-" + row.processId + "-" + row.userId] !== "1")) {
+        this.previewSopFlag[row.dispatchCode + "-" + row.processId + "-" + row.userId] = "1";
+        getAttachInfoList(this.ATTACH_TYPE.SOP, row.dispatchCode, row.processId, row.userId).then(res => {
+          let attachList = res.data;
+          attachList.forEach(e => {
+            let previewFile = {};
+            previewFile.url = e.attachPath;
+            previewFile.name = e.attachName;
+            this.fileList.push(previewFile);
+
+            let groupSopFile = {};
+            groupSopFile.dispatchCode = row.dispatchCode;
+            groupSopFile.processId = row.processId;
+            groupSopFile.attachId = e.attachId;
+            groupSopFile.attachPath = e.attachPath;
+            groupSopFile.attachName = e.attachName;
+            let groupSopFileList = this.groupSopFileList[this.addProductPlanObject.dispatchCode + "-" + this.addProductPlanObject.processId + "-" + this.addProductPlanObject.userId];
+            this.groupSopFileList[this.addProductPlanObject.dispatchCode + "-" + this.addProductPlanObject.processId + "-" + this.addProductPlanObject.userId] = groupSopFileList ? this.groupSopFileList[this.addProductPlanObject.dispatchCode + "-" + this.addProductPlanObject.processId + "-" + this.addProductPlanObject.userId] : [];
+            this.groupSopFileList[this.addProductPlanObject.dispatchCode + "-" + this.addProductPlanObject.processId + "-" + this.addProductPlanObject.userId].push(groupSopFile);
+
+            let uploadSopList = this.uploadSopList[this.addProductPlanObject.dispatchCode + "-" + this.addProductPlanObject.processId + "-" + this.addProductPlanObject.userId];
+            this.uploadSopList[this.addProductPlanObject.dispatchCode + "-" + this.addProductPlanObject.processId + "-" + this.addProductPlanObject.userId] = uploadSopList ? this.uploadSopList[this.addProductPlanObject.dispatchCode + "-" + this.addProductPlanObject.processId + "-" + this.addProductPlanObject.userId] : [];
+            this.uploadSopList[this.addProductPlanObject.dispatchCode + "-" + this.addProductPlanObject.processId + "-" + this.addProductPlanObject.userId].push(e.attachId);
+
+          })
+        })
+      } else {
+        if (this.groupSopFileList[row.dispatchCode + "-" + row.processId + "-" + row.userId]) {
+          this.groupSopFileList[row.dispatchCode + "-" + row.processId + "-" + row.userId].forEach(e => {
+            let previewFile = {};
+            previewFile.url = e.attachPath;
+            previewFile.name = e.attachName;
+            this.fileList.push(previewFile);
+          })
+        }
+      }
+
+      this.addProductPlanObject = row;
+      this.materialBomAttachIdList = [];
+      getBomAttachInfo(this.ATTACH_TYPE.SOP, this.addProductPlanObject.materialBomId).then(response => {
+        this.attachInfoList = response.data;
+        for (let e of this.fileList) {
+          let attachInfo = this.attachInfoList.find(item => item.attachPath === e.url);
+          if (attachInfo != null){
+            this.materialBomAttachIdList.push(attachInfo.attachId);
+          }
+        }
+        this.sopViewModel = true;
+      });
+    },
+
+    //添加sop提交
+    sopFileUploadSubmit() {
+      for (let i = 0; i < this.mesProductPlanList.length; i++) {
+        let mesProductPlan = this.mesProductPlanList[i];
+        for (let child of mesProductPlan.children) {
+          if (mesProductPlan.dispatchCode === this.addProductPlanObject.dispatchCode
+            && mesProductPlan.processId === this.addProductPlanObject.processId
+            && child.userId === this.addProductPlanObject.userId) {
+            child.sopId = this.uploadSopList[this.addProductPlanObject.dispatchCode + "-" + this.addProductPlanObject.processId + "-" + this.addProductPlanObject.userId].join(",");
+          }
+        }
+      }
+      // this.uploadAttachList = [];
+      this.addProductPlanObject = {};
+      this.sopViewModel = false;
+    },
+
+
+    //Sop图片上传
+    httpSopRequest(file) {
+      // 文件信息
+      const fileData = file.file;
+      const formData = new FormData();
+      formData.append("file", fileData);
+      formData.append("processId", this.addProductPlanObject.processId);
+      formData.append("attachType", this.ATTACH_TYPE.SOP);
+      uploadFile(formData).then(
+        (res) => {
+          let uploadSopList = this.uploadSopList[this.addProductPlanObject.dispatchCode + "-" + this.addProductPlanObject.processId + "-" + this.addProductPlanObject.userId];
+          this.uploadSopList[this.addProductPlanObject.dispatchCode + "-" + this.addProductPlanObject.processId + "-" + this.addProductPlanObject.userId] = uploadSopList ? this.uploadSopList[this.addProductPlanObject.dispatchCode + "-" + this.addProductPlanObject.processId + "-" + this.addProductPlanObject.userId] : [];
+          this.uploadSopList[this.addProductPlanObject.dispatchCode + "-" + this.addProductPlanObject.processId + "-" + this.addProductPlanObject.userId].push(res.attachId);
+
+          // 存储附件信息主键
+          let groupSopFile = {};
+          groupSopFile.dispatchCode = this.addProductPlanObject.dispatchCode;
+          groupSopFile.processId = this.addProductPlanObject.processId;
+          groupSopFile.attachId = res.attachId;
+          groupSopFile.attachPath = res.imgUrl;
+          groupSopFile.attachName = res.fileName;
+          let groupSopFileList = this.groupSopFileList[this.addProductPlanObject.dispatchCode + "-" + this.addProductPlanObject.processId + "-" + this.addProductPlanObject.userId];
+          this.groupSopFileList[this.addProductPlanObject.dispatchCode + "-" + this.addProductPlanObject.processId + "-" + this.addProductPlanObject.userId] = groupSopFileList ? this.groupSopFileList[this.addProductPlanObject.dispatchCode + "-" + this.addProductPlanObject.processId + "-" + this.addProductPlanObject.userId] : [];
+          this.groupSopFileList[this.addProductPlanObject.dispatchCode + "-" + this.addProductPlanObject.processId + "-" + this.addProductPlanObject.userId].push(groupSopFile);
+          this.$modal.closeLoading();
+        }, (err) => {
+          this.$refs.drawingUpload.clearFiles();  //上传失败后清除当前上传的图片
+          this.$modal.closeLoading();
+        }
+      );
+    },
+
+    //删除上传的图片
+    handleRemoveSop(file) {
+      let arrPic = this.$refs.drawingUpload.uploadFiles;
+      let index = arrPic.indexOf(file);
+      this.uploadSopList[this.addProductPlanObject.dispatchCode + "-" + this.addProductPlanObject.processId + "-" + this.addProductPlanObject.userId].splice(index, 1);
+      this.groupSopFileList[this.addProductPlanObject.dispatchCode + "-" + this.addProductPlanObject.processId + "-" + this.addProductPlanObject.userId].splice(index, 1);
+      this.fileList.splice(index, 1);
+      let num = 0;
+      arrPic.map((item) => {
+        if (item.uid === file.uid) {
+          arrPic.splice(num, 1);
+        }
+        num++;
+      });
+      let attachInfo = this.attachInfoList.find(item => item.attachPath === file.url);
+      if (attachInfo != null){
+        this.materialBomAttachIdList = this.materialBomAttachIdList.filter(item => item !== attachInfo.attachId);
+      }
+    },
+
+
+    // 上传前loading加载
+    handleBeforeUpload(file) {
+      let fileType, fileSize;
+      if (this.sopViewModel) {
+        fileType = this.sopFileType;
+        fileSize = this.sopFileSize;
+      } else if (this.blueprintModel) {
+        fileType = this.drawingFileType;
+        fileSize = this.drawingFileSize;
+      }
+
+      let isImg = false;
+      if (fileType.length) {
+        let fileExtension = "";
+        if (file.name.lastIndexOf(".") > -1) {
+          fileExtension = file.name.slice(file.name.lastIndexOf(".") + 1);
+        }
+        isImg = fileType.some(type => {
+          if (file.type.indexOf(type) > -1) return true;
+          if (fileExtension && fileExtension.indexOf(type) > -1) return true;
+          return false;
+        });
+      } else {
+        isImg = file.type.indexOf("image") > -1;
+      }
+
+      if (!isImg) {
+        this.$modal.msgError(`文件格式不正确, 请上传${fileType.join("/")}格式文件!`);
+        return false;
+      }
+      if (fileSize) {
+        const isLt = file.size / 1024 / 1024 < fileSize;
+        if (!isLt) {
+          this.$modal.msgError(`上传文件大小不能超过 ${fileSize} MB!`);
+          return false;
+        }
+      }
+      this.$modal.loading("正在上传文件，请稍候...");
+      this.number++;
+    },
+    // 文件个数超出
+    handleExceed() {
+      this.$modal.msgError(`上传文件数量不能超过 ${this.limit} !`);
+    },
+
+    handleDeleteDispatchUser(row) {
+      this.mesProductPlanList.forEach(mesProductPlan => {
+        mesProductPlan.children = mesProductPlan.children.filter(item => item.id !== row.id);
+      });
+      if (row.planId != null && row.planId !== '') {
+        this.toDeletedPlanIds.push(row.planId);
+      }
+
+    },
+
+    handleApplyRawOutstock(row) {
+      if (row.processType === this.PROCESS_TYPE.AUTO) {
+        this.applyRawOutstockOpen = true;
+        this.productPlanData.planCode = row.planCode;
+        this.productPlanData.planId = row.planId;
+        this.productPlanData.dispatchAmount = row.dispatchAmount;
+        this.productPlanData.saleOrderId = this.form.saleOrderId;
+        this.productPlanData.materialBomId = this.form.materialBomId;
+      }
+    },
+
+    closeRawOutstockDialog() {
+      this.applyRawOutstockOpen = false;
+    },
+    //根据BOM更新图纸或SOP
+    updateAttachInfoByBom(newVal, oldVal) {
+      if (newVal.length === 0) {
+        return
+      }
+      let result = [];
+      let targetAttachIds = newVal.filter(item => !oldVal.includes(item));
+      for (let targetAttachId of targetAttachIds) {
+        result.push(this.attachInfoList.find(item => item.attachId === targetAttachId));
+      }
+      console.log("result:",result);
+      let isDrawing = this.blueprintModel;
+      //图纸
+      if (isDrawing) {
+        for (let e of result) {
+          let previewFile = {};
+          previewFile.url = e.attachPath;
+          previewFile.name = e.attachName;
+          this.fileList.push(previewFile);
+          let groupAttachFile = {};
+          groupAttachFile.dispatchCode = this.addProductPlanObject.dispatchCode;
+          groupAttachFile.processId = this.addProductPlanObject.processId;
+          groupAttachFile.attachId = e.attachId;
+          groupAttachFile.attachPath = e.attachPath;
+          groupAttachFile.attachName = e.attachName;
+          let groupAttachFileList = this.groupAttachFileList[this.addProductPlanObject.dispatchCode + "-" + this.addProductPlanObject.processId + "-" + this.addProductPlanObject.userId];
+          this.groupAttachFileList[this.addProductPlanObject.dispatchCode + "-" + this.addProductPlanObject.processId + "-" + this.addProductPlanObject.userId] = groupAttachFileList ? this.groupAttachFileList[this.addProductPlanObject.dispatchCode + "-" + this.addProductPlanObject.processId + "-" + this.addProductPlanObject.userId] : [];
+          this.groupAttachFileList[this.addProductPlanObject.dispatchCode + "-" + this.addProductPlanObject.processId + "-" + this.addProductPlanObject.userId].push(groupAttachFile);
+          let uploadAttachList = this.uploadAttachList[this.addProductPlanObject.dispatchCode + "-" + this.addProductPlanObject.processId + "-" + this.addProductPlanObject.userId];
+          this.uploadAttachList[this.addProductPlanObject.dispatchCode + "-" + this.addProductPlanObject.processId + "-" + this.addProductPlanObject.userId] = uploadAttachList ? this.uploadAttachList[this.addProductPlanObject.dispatchCode + "-" + this.addProductPlanObject.processId + "-" + this.addProductPlanObject.userId] : [];
+          this.uploadAttachList[this.addProductPlanObject.dispatchCode + "-" + this.addProductPlanObject.processId + "-" + this.addProductPlanObject.userId].push(e.attachId);
+        }
+      } else {
+        //SOP
+        for (let e of result) {
+          let previewFile = {};
+          previewFile.url = e.attachPath;
+          previewFile.name = e.attachName;
+          this.fileList.push(previewFile);
+          let groupSopFile = {};
+          groupSopFile.dispatchCode = this.addProductPlanObject.dispatchCode;
+          groupSopFile.processId = this.addProductPlanObject.processId;
+          groupSopFile.attachId = e.attachId;
+          groupSopFile.attachPath = e.attachPath;
+          groupSopFile.attachName = e.attachName;
+          let groupSopFileList = this.groupSopFileList[this.addProductPlanObject.dispatchCode + "-" + this.addProductPlanObject.processId + "-" + this.addProductPlanObject.userId];
+          this.groupSopFileList[this.addProductPlanObject.dispatchCode + "-" + this.addProductPlanObject.processId + "-" + this.addProductPlanObject.userId] = groupSopFileList ? this.groupSopFileList[this.addProductPlanObject.dispatchCode + "-" + this.addProductPlanObject.processId + "-" + this.addProductPlanObject.userId] : [];
+          this.groupSopFileList[this.addProductPlanObject.dispatchCode + "-" + this.addProductPlanObject.processId + "-" + this.addProductPlanObject.userId].push(groupSopFile);
+          let uploadSopList = this.uploadSopList[this.addProductPlanObject.dispatchCode + "-" + this.addProductPlanObject.processId + "-" + this.addProductPlanObject.userId];
+          this.uploadSopList[this.addProductPlanObject.dispatchCode + "-" + this.addProductPlanObject.processId + "-" + this.addProductPlanObject.userId] = uploadSopList ? this.uploadSopList[this.addProductPlanObject.dispatchCode + "-" + this.addProductPlanObject.processId + "-" + this.addProductPlanObject.userId] : [];
+          this.uploadSopList[this.addProductPlanObject.dispatchCode + "-" + this.addProductPlanObject.processId + "-" + this.addProductPlanObject.userId].push(e.attachId);
+        }
+      }
+    },
+
+    isOptionDisabled(attachId) {
+      // 根据业务逻辑，禁用某些选项的删除
+      return this.materialBomAttachIdList.includes(attachId); // 例如可以禁用某些特定选项
+    }
+
+  },
+
+
+
+  mounted() {
+  }
+}
+;
+</script>
+
+<style scoped>
+/deep/.el-icon-close{display:none}
+/deep/.el-upload{
+  display: none;
+}
+</style>
diff --git a/src/views/mes/orderInfo/index.vue b/src/views/mes/orderInfo/index.vue
index 742252e..c30e966 100644
--- a/src/views/mes/orderInfo/index.vue
+++ b/src/views/mes/orderInfo/index.vue
@@ -5,10 +5,6 @@
       <div v-show='showSearch' class='mb-[10px]'>
         <el-card shadow='hover'>
           <el-form ref='queryFormRef' :model='queryParams' :inline='true'>
-            <el-form-item label='主键标识' prop='productOrderId'>
-              <el-input v-model='queryParams.productOrderId' placeholder='请输入主键标识' clearable
-                        @keyup.enter='handleQuery' />
-            </el-form-item>
             <el-form-item label='订单编号' prop='orderCode'>
               <el-input v-model='queryParams.orderCode' placeholder='请输入订单编号' clearable @keyup.enter='handleQuery' />
             </el-form-item>
@@ -41,8 +37,8 @@
 <!--                <el-option v-for='dict in mes_finish_flag' :key='dict.value' :label='dict.label' :value='dict.value' />-->
 <!--              </el-select>-->
 <!--            </el-form-item>-->
-<!--            <el-form-item label='是否已下达工单' prop='releaseFlag'>-->
-<!--              <el-select v-model='queryParams.releaseFlag' placeholder='请选择是否已下达工单' clearable>-->
+<!--            <el-form-item label='下达工单' prop='releaseFlag'>-->
+<!--              <el-select v-model='queryParams.releaseFlag' placeholder='请选择下达工单' clearable>-->
 <!--                <el-option v-for='dict in mes_release_flag' :key='dict.value' :label='dict.label' :value='dict.value' />-->
 <!--              </el-select>-->
 <!--            </el-form-item>-->
@@ -93,25 +89,22 @@
             <dict-tag :options='mes_order_type' :value='scope.row.orderType' />
           </template>
         </el-table-column>
-        <el-table-column label='成品名称' align='center' prop='materialId' v-if='columns[6].visible' />
-        <el-table-column label='物料BOM' align='center' prop='materialBomId'
-                         v-if='columns[7].visible' />
+        <el-table-column label='成品名称' align='center' prop='materialName' v-if='columns[6].visible' width='160' />
+        <el-table-column label='物料BOM' align='center' prop='materialBomId' v-if='columns[7].visible' width='100' />
         <el-table-column label='派工类型' align='center' prop='dispatchType' v-if='columns[8].visible'>
           <template #default='scope'>
             <dict-tag :options='mes_dispatch_type' :value='scope.row.dispatchType' />
           </template>
         </el-table-column>
-        <el-table-column label='派工ID' align='center' prop='dispatchId' v-if='columns[9].visible' />
-        <el-table-column label='销售数量' align='center' prop='saleAmount'
-                         v-if='columns[10].visible' />
+        <el-table-column :label='dispatchTypeName' align='center' prop='dispatchId' v-if='columns[9].visible' />
+        <el-table-column label='销售数量' align='center' prop='saleAmount' v-if='columns[10].visible' />
         <el-table-column label='计划交货日期' align='center' prop='planDeliveryDate' width='180' v-if='columns[11].visible'>
           <template #default='scope'>
             <span>{{ parseTime(scope.row.planDeliveryDate, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
           </template>
         </el-table-column>
         <el-table-column label='计划数量' align='center' prop='planAmount' v-if='columns[12].visible' />
-        <el-table-column label='已派工数量' align='center' prop='dispatchAmount'
-                         v-if='columns[13].visible' />
+        <el-table-column label='已派工数量' align='center' prop='dispatchAmount' v-if='columns[13].visible' />
         <el-table-column label='完成数量' align='center' prop='completeAmount' v-if='columns[14].visible' />
         <el-table-column label='发布时间' align='center' prop='releaseTime' width='180' v-if='columns[15].visible'>
           <template #default='scope'>
@@ -128,12 +121,12 @@
             <span>{{ parseTime(scope.row.planEndTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
           </template>
         </el-table-column>
-        <el-table-column label='开始时间' align='center' prop='realBeginTime' width='180' v-if='columns[18].visible'>
+        <el-table-column label='实际开始时间' align='center' prop='realBeginTime' width='180' v-if='columns[18].visible'>
           <template #default='scope'>
             <span>{{ parseTime(scope.row.realBeginTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
           </template>
         </el-table-column>
-        <el-table-column label='完成时间' align='center' prop='realEndTime' width='180' v-if='columns[19].visible'>
+        <el-table-column label='实际完成时间' align='center' prop='realEndTime' width='180' v-if='columns[19].visible'>
           <template #default='scope'>
             <span>{{ parseTime(scope.row.realEndTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
           </template>
@@ -155,7 +148,7 @@
             <dict-tag :options='mes_finish_flag' :value='scope.row.finishFlag' />
           </template>
         </el-table-column>
-        <el-table-column label='是否已下达工单' align='center' prop='releaseFlag' v-if='columns[25].visible'>
+        <el-table-column label='下达工单' align='center' prop='releaseFlag' v-if='columns[25].visible' width='80'>
           <template #default='scope'>
             <dict-tag :options='mes_release_flag' :value='scope.row.releaseFlag' />
           </template>
@@ -163,16 +156,21 @@
         <el-table-column label='订单版本' align='center' prop='orderVersion' v-if='columns[26].visible' />
         <el-table-column label='工厂ID' align='center' prop='factoryId' v-if='columns[27].visible' />
         <el-table-column label='备注' align='center' prop='remark' v-if='columns[28].visible' />
-        <el-table-column label='操作' align='center' class-name='small-padding fixed-width'>
+        <el-table-column label='操作' align='center' class-name="small-padding fixed-width"  fixed="right">
           <template #default='scope'>
-            <el-tooltip content='修改' placement='top'>
-              <el-button link type='primary' icon='Edit' @click='handleUpdate(scope.row)'
-                         v-hasPermi="['mes:orderInfo:edit']"></el-button>
-            </el-tooltip>
-            <el-tooltip content='删除' placement='top'>
-              <el-button link type='primary' icon='Delete' @click='handleDelete(scope.row)'
-                         v-hasPermi="['mes:orderInfo:remove']"></el-button>
-            </el-tooltip>
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-user-solid"
+              @click="handleDispatch(scope.row)"
+              v-if="1===1"
+              v-hasPermi="['mes:orderInfo:edit']"
+            >生产派工
+            </el-button>
+<!--            <el-tooltip content='删除' placement='top'>-->
+<!--              <el-button link type='primary' icon='Delete' @click='handleDelete(scope.row)'-->
+<!--                         v-hasPermi="['mes:orderInfo:remove']"></el-button>-->
+<!--            </el-tooltip>-->
           </template>
         </el-table-column>
       </el-table>
@@ -212,7 +210,7 @@
           <el-input v-model='form.materialBomId' placeholder='请输入物料BOM' />
         </el-form-item>
         <el-form-item label='派工类型' prop='dispatchType'>
-          <el-radio-group v-model='form.dispatchType'>
+          <el-radio-group v-model='form.dispatchType' :disabled="true">
             <el-radio
               v-for='dict in mes_dispatch_type'
               :key='dict.value'
@@ -221,8 +219,15 @@
             </el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item label='派工ID' prop='dispatchId'>
-          <el-input v-model='form.dispatchId' placeholder='请输入派工ID' />
+        <el-form-item :label='dispatchTypeName' prop='dispatchId'>
+          <el-select v-model="form.dispatchId" placeholder="请选择">
+            <el-option
+              v-for="item in dispatchTypeList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            ></el-option>
+          </el-select>
         </el-form-item>
 <!--        <el-form-item label='销售数量' prop='saleAmount'>-->
 <!--          <el-input v-model='form.saleAmount' placeholder='请输入销售数量' />-->
@@ -284,6 +289,9 @@
 <script setup name='OrderInfo' lang='ts'>
 import { listOrderInfo, getOrderInfo, delOrderInfo, addOrderInfo, updateOrderInfo } from '@/api/mes/orderInfo';
 import { OrderInfoVO, OrderInfoQuery, OrderInfoForm } from '@/api/mes/orderInfo/types';
+import { getProcessInfoList } from '@/api/mes/baseProcessInfo';
+import { getBaseRouteList } from '@/api/mes/baseRoute';
+import { getProdLineList } from '@/api/mes/baseProdLineInfo';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const {
@@ -306,6 +314,9 @@ const total = ref(0);
 
 const queryFormRef = ref<ElFormInstance>();
 const orderInfoFormRef = ref<ElFormInstance>();
+/** 下拉框查询派工类型信息列表 */
+const dispatchTypeList = ref([])
+const dispatchTypeName = ref("");
 
 const dialog = reactive<DialogOption>({
   visible: false,
@@ -324,24 +335,24 @@ const columns = ref<FieldOption[]>([
   { key: 7, label: `物料BOM`, visible: true },
   { key: 8, label: `派工类型`, visible: true },
   { key: 9, label: `派工ID`, visible: true },
-  { key: 10, label: `销售数量`, visible: true },
+  { key: 10, label: `销售数量`, visible: false },
   { key: 11, label: `计划交货日期`, visible: true },
   { key: 12, label: `计划数量`, visible: true },
   { key: 13, label: `已派工数量`, visible: false },
   { key: 14, label: `完成数量`, visible: true },
-  { key: 15, label: `发布时间`, visible: true },
+  { key: 15, label: `发布时间`, visible: false },
   { key: 16, label: `计划开始时间`, visible: true },
   { key: 17, label: `计划结束时间`, visible: true },
-  { key: 18, label: `开始时间`, visible: true },
-  { key: 19, label: `完成时间`, visible: true },
+  { key: 18, label: `实际开始时间`, visible: true },
+  { key: 19, label: `实际完成时间`, visible: true },
   { key: 20, label: `订单状态`, visible: true },
   { key: 21, label: `库存锁定标识`, visible: false },
   { key: 22, label: `前置生产订单ID`, visible: false },
   { key: 23, label: `前置订单编号`, visible: false },
   { key: 24, label: `完成标识`, visible: true },
-  { key: 25, label: `是否已下达工单`, visible: true },
-  { key: 26, label: `订单版本`, visible: true },
-  { key: 27, label: `工厂ID`, visible: true },
+  { key: 25, label: `下达工单`, visible: true },
+  { key: 26, label: `订单版本`, visible: false },
+  { key: 27, label: `工厂ID`, visible: false },
   { key: 28, label: `备注`, visible: false },
   { key: 29, label: `创建部门`, visible: false },
   { key: 30, label: `创建人`, visible: false },
@@ -358,7 +369,7 @@ const initFormData: OrderInfoForm = {
   orderType: '1',
   materialId: undefined,
   materialBomId: undefined,
-  dispatchType: '2',
+  dispatchType: undefined,
   dispatchId: undefined,
   saleAmount: undefined,
   planDeliveryDate: undefined,
@@ -518,5 +529,42 @@ const handleExport = () => {
 
 onMounted(() => {
   getList();
+  dispatchTypeFunction();  //派工类型(1产线 2工艺路线 3工序)
 });
+
+const dispatchTypeFunction = async () => {
+  const dispatchTypeRes = await proxy?.getConfigKey('sys.orderInfo.dispatchType');
+  initFormData.dispatchType = dispatchTypeRes.data;
+  if (dispatchTypeRes.data === '1'){
+    dispatchTypeName.value = "产线";
+    const res = await getProdLineList(null);
+    dispatchTypeList.value = res.data.map(item => ({
+      id: item.prodLineId,
+      name: item.prodLineName
+    }));
+  } else if (dispatchTypeRes.data === '2'){
+    dispatchTypeName.value = "工艺路线";
+    const res = await getBaseRouteList(null);
+    dispatchTypeList.value = res.data.map(item => ({
+      id: item.routeId,
+      name: item.routeName
+    }));
+  } else if (dispatchTypeRes.data === '3'){
+    dispatchTypeName.value = "工序";
+    const res = await getProcessInfoList(null);
+    dispatchTypeList.value = res.data.map(item => ({
+      id: item.processId,
+      name: item.processName
+    }));
+  }
+};
+
+const handleDispatch = (row) => {
+  const productOrderId = row.productOrderId || this.ids[0];
+  const orderCode = row.orderCode;
+  const params = {queryParams: queryParams};
+  // this.$tab.closeOpenPage(router.currentRoute);
+  proxy?.$tab.openPage( '/mes/product-plan/index/' + productOrderId,"任务[" + orderCode + "]生产派工", params);
+};
+
 </script>
diff --git a/src/views/mes/planInfo/index.vue b/src/views/mes/planInfo/index.vue
index 1ad4509..145d391 100644
--- a/src/views/mes/planInfo/index.vue
+++ b/src/views/mes/planInfo/index.vue
@@ -16,9 +16,9 @@
 <!--            <el-form-item label="物料BOM" prop="materialBomId">-->
 <!--              <el-input v-model="queryParams.materialBomId" placeholder="请输入物料BOM" clearable @keyup.enter="handleQuery" />-->
 <!--            </el-form-item>-->
-            <el-form-item label="工序ID" prop="processId">
-              <el-input v-model="queryParams.processId" placeholder="请输入工序ID" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
+<!--            <el-form-item label="工序ID" prop="processId">-->
+<!--              <el-input v-model="queryParams.processId" placeholder="请输入工序ID" clearable @keyup.enter="handleQuery" />-->
+<!--            </el-form-item>-->
 <!--            <el-form-item label="下达ID" prop="releaseId">-->
 <!--              <el-input v-model="queryParams.releaseId" placeholder="请输入下达ID" clearable @keyup.enter="handleQuery" />-->
 <!--            </el-form-item>-->
@@ -35,11 +35,11 @@
                 <el-option v-for="dict in mes_plan_status" :key="dict.value" :label="dict.label" :value="dict.value"/>
               </el-select>
             </el-form-item>
-<!--            <el-form-item label="班次ID" prop="shiftId">-->
-<!--              <el-input v-model="queryParams.shiftId" placeholder="请输入班次ID" clearable @keyup.enter="handleQuery" />-->
+<!--            <el-form-item label="班次" prop="shiftId">-->
+<!--              <el-input v-model="queryParams.shiftId" placeholder="请输入班次" clearable @keyup.enter="handleQuery" />-->
 <!--            </el-form-item>-->
-<!--            <el-form-item label="班组ID" prop="classTeamId">-->
-<!--              <el-input v-model="queryParams.classTeamId" placeholder="请输入班组ID" clearable @keyup.enter="handleQuery" />-->
+<!--            <el-form-item label="班组" prop="classTeamId">-->
+<!--              <el-input v-model="queryParams.classTeamId" placeholder="请输入班组" clearable @keyup.enter="handleQuery" />-->
 <!--            </el-form-item>-->
             <el-form-item label="模号" prop="modelCode">
               <el-select v-model="queryParams.modelCode" placeholder="请选择模号" clearable >
@@ -82,9 +82,9 @@
         <el-table-column label="销售订单编号" align="center" prop="saleorderCode" v-if="columns[4].visible"/>
         <el-table-column label="计划编号" align="center" prop="planCode" v-if="columns[5].visible" width="100"/>
         <el-table-column label="派工单号" align="center" prop="dispatchCode" v-if="columns[6].visible"/>
-        <el-table-column label="物料ID" align="center" prop="materialId" v-if="columns[7].visible"/>
+        <el-table-column label="物料名称" align="center" prop="materialName" v-if="columns[7].visible" width="160"/>
         <el-table-column label="物料BOM" align="center" prop="materialBomId" v-if="columns[8].visible"  width="100"/>
-        <el-table-column label="工序ID" align="center" prop="processId" v-if="columns[9].visible"/>
+        <el-table-column label="工序名称" align="center" prop="processName" v-if="columns[9].visible"/>
         <el-table-column label="顺序" align="center" prop="processOrder" v-if="columns[10].visible"/>
         <el-table-column label="上一工序ID" align="center" prop="lastProcessId" v-if="columns[11].visible"  width="100"/>
         <el-table-column label="最后工序标识" align="center" prop="finalProcessFlag" v-if="columns[12].visible"  width="110">
@@ -139,8 +139,8 @@
           </template>
         </el-table-column>
         <el-table-column label="优先级" align="center" prop="priority" v-if="columns[27].visible"/>
-        <el-table-column label="班次ID" align="center" prop="shiftId" v-if="columns[28].visible"/>
-        <el-table-column label="班组ID" align="center" prop="classTeamId" v-if="columns[29].visible"/>
+        <el-table-column label="班次" align="center" prop="shiftName" v-if="columns[28].visible"/>
+        <el-table-column label="班组" align="center" prop="teamName" v-if="columns[29].visible"/>
         <el-table-column label="模号" align="center" prop="modelCode" v-if="columns[30].visible">
           <template #default="scope">
             <dict-tag :options="mes_model_code" :value="scope.row.modelCode"/>
@@ -179,18 +179,18 @@
         <el-form-item label="派工单号" prop="dispatchCode">
           <el-input v-model="form.dispatchCode" placeholder="请输入派工单号" />
         </el-form-item>
-        <el-form-item label="物料ID" prop="materialId">
-          <el-input v-model="form.materialId" placeholder="请输入物料ID" />
+        <el-form-item label="物料名称" prop="materialId">
+          <el-input v-model="form.materialId" placeholder="请输入物料名称" />
         </el-form-item>
         <el-form-item label="物料BOM" prop="materialBomId">
           <el-input v-model="form.materialBomId" placeholder="请输入物料BOM" />
         </el-form-item>
-        <el-form-item label="工序ID" prop="processId">
-          <el-input v-model="form.processId" placeholder="请输入工序ID" />
-        </el-form-item>
-        <el-form-item label="顺序" prop="processOrder">
-          <el-input-number v-model="form.processOrder" placeholder="请输入顺序" style="width: 200px;"/>
+        <el-form-item label="工序名称" prop="processId">
+          <el-input v-model="form.processId" placeholder="请输入工序名称" />
         </el-form-item>
+<!--        <el-form-item label="顺序" prop="processOrder">-->
+<!--          <el-input-number v-model="form.processOrder" placeholder="请输入顺序" style="width: 200px;"/>-->
+<!--        </el-form-item>-->
 <!--        <el-form-item label="上一工序ID" prop="lastProcessId">-->
 <!--          <el-input v-model="form.lastProcessId" placeholder="请输入上一工序ID" />-->
 <!--        </el-form-item>-->
@@ -246,11 +246,24 @@
         <el-form-item label="优先级" prop="priority">
           <el-input-number v-model="form.priority" placeholder="请输入优先级" style="width: 200px;" />
         </el-form-item>
-        <el-form-item label="班次ID" prop="shiftId">
-          <el-input v-model="form.shiftId" placeholder="请输入班次ID" />
+        <el-form-item label="班次" prop="shiftId">
+          <el-radio-group v-model="form.shiftId">
+            <el-radio
+              v-for="dict in shiftList"
+              :key="dict.shiftId"
+              :value="dict.shiftId"
+            >{{dict.shiftName}}</el-radio>
+          </el-radio-group>
         </el-form-item>
-        <el-form-item label="班组ID" prop="classTeamId">
-          <el-input v-model="form.classTeamId" placeholder="请输入班组ID" />
+        <el-form-item label="班组" prop="classTeamId">
+          <el-select v-model="form.classTeamId" placeholder="请选择班组">
+            <el-option
+              v-for="item in classTeamList"
+              :key="item.classTeamId"
+              :label="item.teamName"
+              :value="item.classTeamId"
+            />
+          </el-select>
         </el-form-item>
         <el-form-item label="模号" prop="modelCode">
           <el-radio-group v-model="form.modelCode">
@@ -278,6 +291,8 @@
 <script setup name="PlanInfo" lang="ts">
 import { listPlanInfo, getPlanInfo, delPlanInfo, addPlanInfo, updatePlanInfo } from '@/api/mes/planInfo';
 import { PlanInfoVO, PlanInfoQuery, PlanInfoForm } from '@/api/mes/planInfo/types';
+import { getBaseShiftInfoList } from '@/api/mes/baseShiftInfo';
+import { getBaseClassTeamInfoList } from '@/api/mes/baseClassTeamInfo';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const { mes_import_flag, active_flag, mes_plan_status, mes_release_type, mes_finish_flag, mes_model_code } = toRefs<any>(proxy?.useDict('mes_import_flag', 'active_flag', 'mes_plan_status', 'mes_release_type', 'mes_finish_flag', 'mes_model_code'));
@@ -299,6 +314,22 @@ const dialog = reactive<DialogOption>({
   title: ''
 });
 
+const shiftList = ref([]);
+const classTeamList = ref([]);
+
+/*获取班次下拉框*/
+const getShiftSelect = async () => {
+  let res = await getBaseShiftInfoList(null);
+  shiftList.value = res.data;
+};
+
+/*获取班组下拉框*/
+const getClassTeamSelect = async () => {
+  let res = await getBaseClassTeamInfoList(null);
+  classTeamList.value = res.data;
+};
+
+
 // 列显隐信息
 const columns = ref<FieldOption[]>([
         { key: 0, label: `主键标识`, visible: false },
@@ -308,9 +339,9 @@ const columns = ref<FieldOption[]>([
         { key: 4, label: `销售订单编号`, visible: false },
         { key: 5, label: `计划编号`, visible: true },
         { key: 6, label: `派工单号`, visible: true },
-        { key: 7, label: `物料ID`, visible: true },
+        { key: 7, label: `物料名称`, visible: true },
         { key: 8, label: `物料BOM`, visible: true },
-        { key: 9, label: `工序ID`, visible: true },
+        { key: 9, label: `工序名称`, visible: true },
         { key: 10, label: `顺序`, visible: true },
         { key: 11, label: `上一工序ID`, visible: true },
         { key: 12, label: `最后工序标识`, visible: true },
@@ -326,11 +357,11 @@ const columns = ref<FieldOption[]>([
         { key: 22, label: `实际完成时间`, visible: true },
         { key: 23, label: `附件信息`, visible: true },
         { key: 24, label: `计划状态`, visible: true },
-        { key: 25, label: `导入类型`, visible: true },
+        { key: 25, label: `导入类型`, visible: false },
         { key: 26, label: `完成标识`, visible: true },
         { key: 27, label: `优先级`, visible: true },
-        { key: 28, label: `班次ID`, visible: true },
-        { key: 29, label: `班组ID`, visible: true },
+        { key: 28, label: `班次`, visible: true },
+        { key: 29, label: `班组`, visible: true },
         { key: 30, label: `模号`, visible: true },
         { key: 31, label: `备注`, visible: false },
         { key: 32, label: `创建部门`, visible: false },
@@ -367,7 +398,7 @@ const initFormData: PlanInfoForm = {
   planStatus: undefined,
   importFlag: undefined,
   finishFlag: [],
-  priority: undefined,
+  priority: 1,
   shiftId: undefined,
   classTeamId: undefined,
   modelCode: undefined,
@@ -416,7 +447,7 @@ const data = reactive<PageData<PlanInfoForm, PlanInfoQuery>>({
       { required: true, message: "计划编号不能为空", trigger: "blur" }
     ],
     materialId: [
-      { required: true, message: "物料ID不能为空", trigger: "blur" }
+      { required: true, message: "物料名称不能为空", trigger: "blur" }
     ],
     materialBomId: [
       { required: true, message: "物料BOM不能为空", trigger: "blur" }
@@ -525,6 +556,8 @@ const handleExport = () => {
 }
 
 onMounted(() => {
+  getShiftSelect();
+  getClassTeamSelect();
   getList();
 });
 </script>
diff --git a/src/views/system/masterData/index.vue b/src/views/system/masterData/index.vue
new file mode 100644
index 0000000..40b3dc9
--- /dev/null
+++ b/src/views/system/masterData/index.vue
@@ -0,0 +1,477 @@
+<template>
+  <div class='p-2'>
+    <transition :enter-active-class='proxy?.animate.searchAnimate.enter'
+                :leave-active-class='proxy?.animate.searchAnimate.leave'>
+      <div v-show='showSearch' class='mb-[10px]'>
+        <el-card shadow='hover'>
+          <el-form ref='queryFormRef' :model='queryParams' :inline='true' >
+            <el-form-item label='所属模块' prop='moduleType'>
+              <el-select v-model='queryParams.moduleType' placeholder='请选择所属模块' clearable>
+                <el-option v-for='dict in sys_module_type' :key='dict.value' :label='dict.label' :value='dict.value' />
+              </el-select>
+            </el-form-item>
+            <el-form-item label='主数据标题' prop='masterDataTitle' label-width="90px">
+              <el-input v-model='queryParams.masterDataTitle' placeholder='请输入主数据标题' clearable
+                        @keyup.enter='handleQuery' />
+            </el-form-item>
+            <el-form-item label='激活标识' prop='activeFlag'>
+              <el-select v-model='queryParams.activeFlag' placeholder='请选择激活标识' clearable>
+                <el-option v-for='dict in active_flag' :key='dict.value' :label='dict.label' :value='dict.value' />
+              </el-select>
+            </el-form-item>
+            <el-form-item>
+              <el-button type='primary' icon='Search' @click='handleQuery'>搜索</el-button>
+              <el-button icon='Refresh' @click='resetQuery'>重置</el-button>
+            </el-form-item>
+          </el-form>
+        </el-card>
+      </div>
+    </transition>
+
+    <el-card shadow='never'>
+      <template #header>
+        <el-row :gutter='10' class='mb8'>
+          <el-col :span='1.5'>
+            <el-button type='primary' plain icon='Plus' @click='handleAdd' v-hasPermi="['system:masterData:add']">新增
+            </el-button>
+          </el-col>
+          <el-col :span='1.5'>
+            <el-button type='success' plain icon='Edit' :disabled='single' @click='handleUpdate()'
+                       v-hasPermi="['system:masterData:edit']">修改
+            </el-button>
+          </el-col>
+          <el-col :span='1.5'>
+            <el-button type='danger' plain icon='Delete' :disabled='multiple' @click='handleDelete()'
+                       v-hasPermi="['system:masterData:remove']">删除
+            </el-button>
+          </el-col>
+          <el-col :span='1.5'>
+            <el-button type='warning' plain icon='Download' @click='handleExport'
+                       v-hasPermi="['system:masterData:export']">导出
+            </el-button>
+          </el-col>
+          <right-toolbar v-model:showSearch='showSearch' :columns='columns' :search='true'
+                         @queryTable='getList'></right-toolbar>
+        </el-row>
+      </template>
+
+      <el-table v-loading='loading' :data='masterDataList' @selection-change='handleSelectionChange'>
+        <el-table-column type='selection' width='55' align='center' />
+        <el-table-column label='主键标识' align='center' prop='masterDataId' v-if='columns[0].visible' />
+        <el-table-column label='所属模块' align='center' prop='moduleType' v-if='columns[2].visible'>
+          <template #default='scope'>
+            <dict-tag :options='sys_module_type' :value='scope.row.moduleType' />
+          </template>
+        </el-table-column>
+        <el-table-column label='父级标识' align='center' prop='parentFlag' v-if='columns[3].visible'>
+          <template #default='scope'>
+            <dict-tag :options='active_flag' :value='scope.row.parentFlag' />
+          </template>
+        </el-table-column>
+        <el-table-column label='菜单ID' align='center' prop='menuId' v-if='columns[4].visible' />
+        <el-table-column label='路由参数' align='center' prop='queryParam' v-if='columns[5].visible' />
+        <el-table-column label='主数据标题' align='center' prop='masterDataTitle' v-if='columns[6].visible'  width="100"/>
+        <el-table-column label='预留字段1名称' align='center' prop='fieldName1' v-if='columns[7].visible' />
+        <el-table-column label='预留字段1显示标识' align='center' prop='displayFlag1' v-if='columns[8].visible' width="90">
+          <template #default='scope'>
+            <dict-tag :options='active_flag' :value='scope.row.displayFlag1' />
+          </template>
+        </el-table-column>
+        <el-table-column label='预留字段2名称' align='center' prop='fieldName2' v-if='columns[9].visible' />
+        <el-table-column label='预留字段2显示标识' align='center' prop='displayFlag2' v-if='columns[10].visible' width="90">
+          <template #default='scope'>
+            <dict-tag :options='active_flag' :value='scope.row.displayFlag2' />
+          </template>
+        </el-table-column>
+        <el-table-column label='预留字段3名称' align='center' prop='fieldName3' v-if='columns[11].visible' />
+        <el-table-column label='预留字段3显示标识' align='center' prop='displayFlag3' v-if='columns[12].visible' width="90">
+          <template #default='scope'>
+            <dict-tag :options='active_flag' :value='scope.row.displayFlag3' />
+          </template>
+        </el-table-column>
+        <el-table-column label='预留字段4名称' align='center' prop='fieldName4' v-if='columns[13].visible' />
+        <el-table-column label='预留字段4显示标识' align='center' prop='displayFlag4' v-if='columns[14].visible' width="90">
+          <template #default='scope'>
+            <dict-tag :options='active_flag' :value='scope.row.displayFlag4' />
+          </template>
+        </el-table-column>
+        <el-table-column label='预留字段5名称' align='center' prop='fieldName5' v-if='columns[15].visible' />
+        <el-table-column label='预留字段5显示标识' align='center' prop='displayFlag5' v-if='columns[16].visible' width="90">
+          <template #default='scope'>
+            <dict-tag :options='active_flag' :value='scope.row.displayFlag5' />
+          </template>
+        </el-table-column>
+        <el-table-column label='激活标识' align='center' prop='activeFlag' v-if='columns[17].visible'>
+          <template #default='scope'>
+            <dict-tag :options='active_flag' :value='scope.row.activeFlag' />
+          </template>
+        </el-table-column>
+        <el-table-column label='备注' align='center' prop='remark' v-if='columns[18].visible' />
+        <el-table-column label='操作' align='center' class-name='small-padding fixed-width'>
+          <template #default='scope'>
+            <el-tooltip content='修改' placement='top'>
+              <el-button link type='primary' icon='Edit' @click='handleUpdate(scope.row)'
+                         v-hasPermi="['system:masterData:edit']"></el-button>
+            </el-tooltip>
+            <el-tooltip content='删除' placement='top'>
+              <el-button link type='primary' icon='Delete' @click='handleDelete(scope.row)'
+                         v-hasPermi="['system:masterData:remove']"></el-button>
+            </el-tooltip>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination v-show='total > 0' :total='total' v-model:page='queryParams.pageNum'
+                  v-model:limit='queryParams.pageSize' @pagination='getList' />
+    </el-card>
+    <!-- 添加或修改主数据维护对话框 -->
+    <el-dialog :title='dialog.title' v-model='dialog.visible' width='600px' append-to-body>
+      <el-form ref='masterDataFormRef' :model='form' :rules='rules' label-width='150px'>
+        <el-form-item label='所属模块' prop='moduleType'>
+          <el-radio-group v-model='form.moduleType'>
+            <el-radio
+              v-for='dict in sys_module_type'
+              :key='dict.value'
+              :value='dict.value'
+            >{{ dict.label }}
+            </el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label='父级标识' prop='parentFlag'>
+          <el-radio-group v-model='form.parentFlag'>
+            <el-radio
+              v-for='dict in active_flag'
+              :key='dict.value'
+              :value='dict.value'
+            >{{ dict.label }}
+            </el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label='菜单ID' prop='menuId'>
+          <el-input v-model='form.menuId' placeholder='请输入菜单ID' />
+        </el-form-item>
+        <el-form-item label='路由参数' prop='queryParam'>
+          <el-input v-model='form.queryParam' placeholder='请输入路由参数' />
+        </el-form-item>
+        <el-form-item label='主数据标题' prop='masterDataTitle'>
+          <el-input v-model='form.masterDataTitle' placeholder='请输入主数据标题' />
+        </el-form-item>
+        <el-form-item label='预留字段1名称' prop='fieldName1'>
+          <el-input v-model='form.fieldName1' placeholder='请输入预留字段1名称' />
+        </el-form-item>
+        <el-form-item label='预留字段1显示标识' prop='displayFlag1'>
+          <el-radio-group v-model='form.displayFlag1'>
+            <el-radio
+              v-for='dict in active_flag'
+              :key='dict.value'
+              :value='dict.value'
+            >{{ dict.label }}
+            </el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label='预留字段2名称' prop='fieldName2'>
+          <el-input v-model='form.fieldName2' placeholder='请输入预留字段2名称' />
+        </el-form-item>
+        <el-form-item label='预留字段2显示标识' prop='displayFlag2'>
+          <el-radio-group v-model='form.displayFlag2'>
+            <el-radio
+              v-for='dict in active_flag'
+              :key='dict.value'
+              :value='dict.value'
+            >{{ dict.label }}
+            </el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label='预留字段3名称' prop='fieldName3'>
+          <el-input v-model='form.fieldName3' placeholder='请输入预留字段3名称' />
+        </el-form-item>
+        <el-form-item label='预留字段3显示标识' prop='displayFlag3'>
+          <el-radio-group v-model='form.displayFlag3'>
+            <el-radio
+              v-for='dict in active_flag'
+              :key='dict.value'
+              :value='dict.value'
+            >{{ dict.label }}
+            </el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label='预留字段4名称' prop='fieldName4'>
+          <el-input v-model='form.fieldName4' placeholder='请输入预留字段4名称' />
+        </el-form-item>
+        <el-form-item label='预留字段4显示标识' prop='displayFlag4'>
+          <el-radio-group v-model='form.displayFlag4'>
+            <el-radio
+              v-for='dict in active_flag'
+              :key='dict.value'
+              :value='dict.value'
+            >{{ dict.label }}
+            </el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label='预留字段5名称' prop='fieldName5'>
+          <el-input v-model='form.fieldName5' placeholder='请输入预留字段5名称' />
+        </el-form-item>
+        <el-form-item label='预留字段5显示标识' prop='displayFlag5'>
+          <el-radio-group v-model='form.displayFlag5'>
+            <el-radio
+              v-for='dict in active_flag'
+              :key='dict.value'
+              :value='dict.value'
+            >{{ dict.label }}
+            </el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label='激活标识' prop='activeFlag'>
+          <el-radio-group v-model='form.activeFlag'>
+            <el-radio
+              v-for='dict in active_flag'
+              :key='dict.value'
+              :value='dict.value'
+            >{{ dict.label }}
+            </el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label='备注' prop='remark'>
+          <el-input v-model='form.remark' placeholder='请输入备注' />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class='dialog-footer'>
+          <el-button :loading='buttonLoading' type='primary' @click='submitForm'>确 定</el-button>
+          <el-button @click='cancel'>取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name='MasterData' lang='ts'>
+import { listMasterData, getMasterData, delMasterData, addMasterData, updateMasterData } from '@/api/system/masterData';
+import { MasterDataVO, MasterDataQuery, MasterDataForm } from '@/api/system/masterData/types';
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const {
+  active_flag,
+  sys_yes_no,
+  sys_module_type
+} = toRefs<any>(proxy?.useDict('active_flag', 'sys_yes_no', 'sys_module_type'));
+
+const masterDataList = ref<MasterDataVO[]>([]);
+const buttonLoading = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref<Array<string | number>>([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+
+const queryFormRef = ref<ElFormInstance>();
+const masterDataFormRef = ref<ElFormInstance>();
+
+const dialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+
+// 列显隐信息
+const columns = ref<FieldOption[]>([
+  { key: 0, label: `主键标识`, visible: false },
+  { key: 1, label: `租户编号`, visible: false },
+  { key: 2, label: `所属模块`, visible: true },
+  { key: 3, label: `父级标识`, visible: true },
+  { key: 4, label: `菜单ID`, visible: false },
+  { key: 5, label: `路由参数`, visible: true },
+  { key: 6, label: `主数据标题`, visible: true },
+  { key: 7, label: `预留字段1名称`, visible: true },
+  { key: 8, label: `预留字段1显示标识`, visible: true },
+  { key: 9, label: `预留字段2名称`, visible: true },
+  { key: 10, label: `预留字段2显示标识`, visible: true },
+  { key: 11, label: `预留字段3名称`, visible: true },
+  { key: 12, label: `预留字段3显示标识`, visible: true },
+  { key: 13, label: `预留字段4名称`, visible: true },
+  { key: 14, label: `预留字段4显示标识`, visible: true },
+  { key: 15, label: `预留字段5名称`, visible: true },
+  { key: 16, label: `预留字段5显示标识`, visible: true },
+  { key: 17, label: `激活标识`, visible: true },
+  { key: 18, label: `备注`, visible: true },
+  { key: 19, label: `创建部门`, visible: false },
+  { key: 20, label: `创建人`, visible: false },
+  { key: 21, label: `创建时间`, visible: false },
+  { key: 22, label: `更新人`, visible: false },
+  { key: 23, label: `更新时间`, visible: false }
+]);
+
+const initFormData: MasterDataForm = {
+  masterDataId: undefined,
+  moduleType: undefined,
+  parentFlag: '0',
+  menuId: undefined,
+  queryParam: undefined,
+  masterDataTitle: undefined,
+  fieldName1: undefined,
+  displayFlag1: '0',
+  fieldName2: undefined,
+  displayFlag2: '0',
+  fieldName3: undefined,
+  displayFlag3: '0',
+  fieldName4: undefined,
+  displayFlag4: '0',
+  fieldName5: undefined,
+  displayFlag5: '0',
+  activeFlag: '1',
+  remark: undefined
+};
+const data = reactive<PageData<MasterDataForm, MasterDataQuery>>({
+  form: { ...initFormData },
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    masterDataId: undefined,
+    moduleType: undefined,
+    parentFlag: undefined,
+    menuId: undefined,
+    queryParam: undefined,
+    masterDataTitle: undefined,
+    fieldName1: undefined,
+    displayFlag1: undefined,
+    fieldName2: undefined,
+    displayFlag2: undefined,
+    fieldName3: undefined,
+    displayFlag3: undefined,
+    fieldName4: undefined,
+    displayFlag4: undefined,
+    fieldName5: undefined,
+    displayFlag5: undefined,
+    activeFlag: undefined,
+    params: {}
+  },
+  rules: {
+    moduleType: [
+      { required: true, message: '所属模块不能为空', trigger: 'change' }
+    ],
+    parentFlag: [
+      { required: true, message: '父级标识不能为空', trigger: 'change' }
+    ],
+    queryParam: [
+      { required: true, message: '路由参数不能为空', trigger: 'blur' }
+    ],
+    masterDataTitle: [
+      { required: true, message: '主数据标题不能为空', trigger: 'blur' }
+    ],
+    displayFlag1: [
+      { required: true, message: '预留字段1显示标识不能为空', trigger: 'change' }
+    ],
+    displayFlag2: [
+      { required: true, message: '预留字段2显示标识不能为空', trigger: 'change' }
+    ],
+    displayFlag3: [
+      { required: true, message: '预留字段3显示标识不能为空', trigger: 'change' }
+    ],
+    displayFlag4: [
+      { required: true, message: '预留字段4显示标识不能为空', trigger: 'change' }
+    ],
+    displayFlag5: [
+      { required: true, message: '预留字段5显示标识不能为空', trigger: 'change' }
+    ],
+    activeFlag: [
+      { required: true, message: '激活标识不能为空', trigger: 'change' }
+    ]
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询主数据维护列表 */
+const getList = async () => {
+  loading.value = true;
+  const res = await listMasterData(queryParams.value);
+  masterDataList.value = res.rows;
+  total.value = res.total;
+  loading.value = false;
+};
+
+/** 取消按钮 */
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+};
+
+/** 表单重置 */
+const reset = () => {
+  form.value = { ...initFormData };
+  masterDataFormRef.value?.resetFields();
+};
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+};
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  handleQuery();
+};
+
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: MasterDataVO[]) => {
+  ids.value = selection.map(item => item.masterDataId);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+};
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+  reset();
+  dialog.visible = true;
+  dialog.title = '添加主数据维护';
+};
+
+/** 修改按钮操作 */
+const handleUpdate = async (row?: MasterDataVO) => {
+  reset();
+  const _masterDataId = row?.masterDataId || ids.value[0];
+  const res = await getMasterData(_masterDataId);
+  Object.assign(form.value, res.data);
+  dialog.visible = true;
+  dialog.title = '修改主数据维护';
+};
+
+/** 提交按钮 */
+const submitForm = () => {
+  masterDataFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      if (form.value.masterDataId) {
+        await updateMasterData(form.value).finally(() => buttonLoading.value = false);
+      } else {
+        await addMasterData(form.value).finally(() => buttonLoading.value = false);
+      }
+      proxy?.$modal.msgSuccess('操作成功');
+      dialog.visible = false;
+      await getList();
+    }
+  });
+};
+
+/** 删除按钮操作 */
+const handleDelete = async (row?: MasterDataVO) => {
+  const _masterDataIds = row?.masterDataId || ids.value;
+  await proxy?.$modal.confirm('是否确认删除主数据维护编号为"' + _masterDataIds + '"的数据项？').finally(() => loading.value = false);
+  await delMasterData(_masterDataIds);
+  proxy?.$modal.msgSuccess('删除成功');
+  await getList();
+};
+
+/** 导出按钮操作 */
+const handleExport = () => {
+  proxy?.download('system/masterData/export', {
+    ...queryParams.value
+  }, `masterData_${new Date().getTime()}.xlsx`);
+};
+
+onMounted(() => {
+  getList();
+});
+</script>
diff --git a/src/views/system/masterDataDetail/index.vue b/src/views/system/masterDataDetail/index.vue
new file mode 100644
index 0000000..541ab75
--- /dev/null
+++ b/src/views/system/masterDataDetail/index.vue
@@ -0,0 +1,392 @@
+<template>
+  <div class='p-2'>
+    <transition :enter-active-class='proxy?.animate.searchAnimate.enter'
+                :leave-active-class='proxy?.animate.searchAnimate.leave'>
+      <div v-show='showSearch' class='mb-[10px]'>
+        <el-card shadow='hover'>
+          <el-form ref='queryFormRef' :model='queryParams' :inline='true'>
+            <el-form-item label='主键标识' prop='masterDataDetailId'>
+              <el-input v-model='queryParams.masterDataDetailId' placeholder='请输入主键标识' clearable
+                        @keyup.enter='handleQuery' />
+            </el-form-item>
+            <el-form-item label='主数据ID' prop='masterDataId'>
+              <el-input v-model='queryParams.masterDataId' placeholder='请输入主数据ID' clearable
+                        @keyup.enter='handleQuery' />
+            </el-form-item>
+<!--            <el-form-item label='父级标识' prop='parentId'>-->
+<!--              <el-input v-model='queryParams.parentId' placeholder='请输入父级标识' clearable @keyup.enter='handleQuery' />-->
+<!--            </el-form-item>-->
+<!--            <el-form-item label='祖级列表' prop='ancestors'>-->
+<!--              <el-input v-model='queryParams.ancestors' placeholder='请输入祖级列表' clearable @keyup.enter='handleQuery' />-->
+<!--            </el-form-item>-->
+<!--            <el-form-item label='主数据明细编号' prop='dataDetailCode'>-->
+<!--              <el-input v-model='queryParams.dataDetailCode' placeholder='请输入主数据明细编号' clearable-->
+<!--                        @keyup.enter='handleQuery' />-->
+<!--            </el-form-item>-->
+<!--            <el-form-item label='主数据明细名称' prop='dataDetailName'>-->
+<!--              <el-input v-model='queryParams.dataDetailName' placeholder='请输入主数据明细名称' clearable-->
+<!--                        @keyup.enter='handleQuery' />-->
+<!--            </el-form-item>-->
+<!--            <el-form-item label='预留字段1数据' prop='fieldData1'>-->
+<!--              <el-input v-model='queryParams.fieldData1' placeholder='请输入预留字段1数据' clearable-->
+<!--                        @keyup.enter='handleQuery' />-->
+<!--            </el-form-item>-->
+<!--            <el-form-item label='预留字段2数据' prop='fieldData2'>-->
+<!--              <el-input v-model='queryParams.fieldData2' placeholder='请输入预留字段2数据' clearable-->
+<!--                        @keyup.enter='handleQuery' />-->
+<!--            </el-form-item>-->
+<!--            <el-form-item label='预留字段3数据' prop='fieldData3'>-->
+<!--              <el-input v-model='queryParams.fieldData3' placeholder='请输入预留字段3数据' clearable-->
+<!--                        @keyup.enter='handleQuery' />-->
+<!--            </el-form-item>-->
+<!--            <el-form-item label='预留字段4数据' prop='fieldData4'>-->
+<!--              <el-input v-model='queryParams.fieldData4' placeholder='请输入预留字段4数据' clearable-->
+<!--                        @keyup.enter='handleQuery' />-->
+<!--            </el-form-item>-->
+<!--            <el-form-item label='预留字段5数据' prop='fieldData5'>-->
+<!--              <el-input v-model='queryParams.fieldData5' placeholder='请输入预留字段5数据' clearable-->
+<!--                        @keyup.enter='handleQuery' />-->
+<!--            </el-form-item>-->
+<!--            <el-form-item label='显示排序' prop='displaySort'>-->
+<!--              <el-input v-model='queryParams.displaySort' placeholder='请输入显示排序' clearable @keyup.enter='handleQuery' />-->
+<!--            </el-form-item>-->
+            <el-form-item label='激活标识' prop='activeFlag'>
+              <el-select v-model='queryParams.activeFlag' placeholder='请选择激活标识' clearable>
+                <el-option v-for='dict in active_flag' :key='dict.value' :label='dict.label' :value='dict.value' />
+              </el-select>
+            </el-form-item>
+            <el-form-item>
+              <el-button type='primary' icon='Search' @click='handleQuery'>搜索</el-button>
+              <el-button icon='Refresh' @click='resetQuery'>重置</el-button>
+            </el-form-item>
+          </el-form>
+        </el-card>
+      </div>
+    </transition>
+
+    <el-card shadow='never'>
+      <template #header>
+        <el-row :gutter='10' class='mb8'>
+          <el-col :span='1.5'>
+            <el-button type='primary' plain icon='Plus' @click='handleAdd' v-hasPermi="['system:masterDataDetail:add']">
+              新增
+            </el-button>
+          </el-col>
+          <el-col :span='1.5'>
+            <el-button type='success' plain icon='Edit' :disabled='single' @click='handleUpdate()'
+                       v-hasPermi="['system:masterDataDetail:edit']">修改
+            </el-button>
+          </el-col>
+          <el-col :span='1.5'>
+            <el-button type='danger' plain icon='Delete' :disabled='multiple' @click='handleDelete()'
+                       v-hasPermi="['system:masterDataDetail:remove']">删除
+            </el-button>
+          </el-col>
+          <el-col :span='1.5'>
+            <el-button type='warning' plain icon='Download' @click='handleExport'
+                       v-hasPermi="['system:masterDataDetail:export']">导出
+            </el-button>
+          </el-col>
+          <right-toolbar v-model:showSearch='showSearch' :columns='columns' :search='true'
+                         @queryTable='getList'></right-toolbar>
+        </el-row>
+      </template>
+
+      <el-table v-loading='loading' :data='masterDataDetailList' @selection-change='handleSelectionChange'>
+        <el-table-column type='selection' width='55' align='center' />
+        <el-table-column label='主键标识' align='center' prop='masterDataDetailId' v-if='columns[0].visible' />
+        <el-table-column label='主数据ID' align='center' prop='masterDataId' v-if='columns[1].visible' />
+        <el-table-column label='父级标识' align='center' prop='parentId' v-if='columns[2].visible' />
+        <el-table-column label='祖级列表' align='center' prop='ancestors' v-if='columns[3].visible' />
+        <el-table-column label='主数据明细编号' align='center' prop='dataDetailCode' v-if='columns[4].visible' />
+        <el-table-column label='主数据明细名称' align='center' prop='dataDetailName' v-if='columns[5].visible' />
+        <el-table-column label='预留字段1数据' align='center' prop='fieldData1' v-if='columns[6].visible' />
+        <el-table-column label='预留字段2数据' align='center' prop='fieldData2' v-if='columns[7].visible' />
+        <el-table-column label='预留字段3数据' align='center' prop='fieldData3' v-if='columns[8].visible' />
+        <el-table-column label='预留字段4数据' align='center' prop='fieldData4' v-if='columns[9].visible' />
+        <el-table-column label='预留字段5数据' align='center' prop='fieldData5' v-if='columns[10].visible' />
+        <el-table-column label='显示排序' align='center' prop='displaySort' v-if='columns[11].visible' />
+        <el-table-column label='备注' align='center' prop='remark' v-if='columns[12].visible' />
+        <el-table-column label='激活标识' align='center' prop='activeFlag' v-if='columns[13].visible'>
+          <template #default='scope'>
+            <dict-tag :options='active_flag' :value='scope.row.activeFlag' />
+          </template>
+        </el-table-column>
+        <el-table-column label='操作' align='center' class-name='small-padding fixed-width'>
+          <template #default='scope'>
+            <el-tooltip content='修改' placement='top'>
+              <el-button link type='primary' icon='Edit' @click='handleUpdate(scope.row)'
+                         v-hasPermi="['system:masterDataDetail:edit']"></el-button>
+            </el-tooltip>
+            <el-tooltip content='删除' placement='top'>
+              <el-button link type='primary' icon='Delete' @click='handleDelete(scope.row)'
+                         v-hasPermi="['system:masterDataDetail:remove']"></el-button>
+            </el-tooltip>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination v-show='total > 0' :total='total' v-model:page='queryParams.pageNum'
+                  v-model:limit='queryParams.pageSize' @pagination='getList' />
+    </el-card>
+    <!-- 添加或修改主数据维护明细对话框 -->
+    <el-dialog :title='dialog.title' v-model='dialog.visible' width='500px' append-to-body>
+      <el-form ref='masterDataDetailFormRef' :model='form' :rules='rules' label-width='80px'>
+        <el-form-item label='主键标识' prop='masterDataDetailId'>
+          <el-input v-model='form.masterDataDetailId' placeholder='请输入主键标识' />
+        </el-form-item>
+        <el-form-item label='主数据ID' prop='masterDataId'>
+          <el-input v-model='form.masterDataId' placeholder='请输入主数据ID' />
+        </el-form-item>
+        <el-form-item label='父级标识' prop='parentId'>
+          <el-input v-model='form.parentId' placeholder='请输入父级标识' />
+        </el-form-item>
+        <el-form-item label='祖级列表' prop='ancestors'>
+          <el-input v-model='form.ancestors' placeholder='请输入祖级列表' />
+        </el-form-item>
+        <el-form-item label='主数据明细编号' prop='dataDetailCode'>
+          <el-input v-model='form.dataDetailCode' placeholder='请输入主数据明细编号' />
+        </el-form-item>
+        <el-form-item label='主数据明细名称' prop='dataDetailName'>
+          <el-input v-model='form.dataDetailName' placeholder='请输入主数据明细名称' />
+        </el-form-item>
+        <el-form-item label='预留字段1数据' prop='fieldData1'>
+          <el-input v-model='form.fieldData1' placeholder='请输入预留字段1数据' />
+        </el-form-item>
+        <el-form-item label='预留字段2数据' prop='fieldData2'>
+          <el-input v-model='form.fieldData2' placeholder='请输入预留字段2数据' />
+        </el-form-item>
+        <el-form-item label='预留字段3数据' prop='fieldData3'>
+          <el-input v-model='form.fieldData3' placeholder='请输入预留字段3数据' />
+        </el-form-item>
+        <el-form-item label='预留字段4数据' prop='fieldData4'>
+          <el-input v-model='form.fieldData4' placeholder='请输入预留字段4数据' />
+        </el-form-item>
+        <el-form-item label='预留字段5数据' prop='fieldData5'>
+          <el-input v-model='form.fieldData5' placeholder='请输入预留字段5数据' />
+        </el-form-item>
+        <el-form-item label='显示排序' prop='displaySort'>
+          <el-input v-model='form.displaySort' placeholder='请输入显示排序' />
+        </el-form-item>
+        <el-form-item label='备注' prop='remark'>
+          <el-input v-model='form.remark' placeholder='请输入备注' />
+        </el-form-item>
+        <el-form-item label='激活标识' prop='activeFlag'>
+          <el-radio-group v-model='form.activeFlag'>
+            <el-radio
+              v-for='dict in active_flag'
+              :key='dict.value'
+              :value='dict.value'
+            >{{ dict.label }}
+            </el-radio>
+          </el-radio-group>
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class='dialog-footer'>
+          <el-button :loading='buttonLoading' type='primary' @click='submitForm'>确 定</el-button>
+          <el-button @click='cancel'>取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name='MasterDataDetail' lang='ts'>
+import {
+  listMasterDataDetail,
+  getMasterDataDetail,
+  delMasterDataDetail,
+  addMasterDataDetail,
+  updateMasterDataDetail
+} from '@/api/system/masterDataDetail';
+import { MasterDataDetailVO, MasterDataDetailQuery, MasterDataDetailForm } from '@/api/system/masterDataDetail/types';
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { active_flag } = toRefs<any>(proxy?.useDict('active_flag'));
+
+const masterDataDetailList = ref<MasterDataDetailVO[]>([]);
+const buttonLoading = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref<Array<string | number>>([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+
+const queryFormRef = ref<ElFormInstance>();
+const masterDataDetailFormRef = ref<ElFormInstance>();
+
+const dialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+
+// 列显隐信息
+const columns = ref<FieldOption[]>([
+  { key: 0, label: `主键标识`, visible: true },
+  { key: 1, label: `主数据ID`, visible: true },
+  { key: 2, label: `父级标识`, visible: true },
+  { key: 3, label: `祖级列表`, visible: true },
+  { key: 4, label: `主数据明细编号`, visible: true },
+  { key: 5, label: `主数据明细名称`, visible: true },
+  { key: 6, label: `预留字段1数据`, visible: true },
+  { key: 7, label: `预留字段2数据`, visible: true },
+  { key: 8, label: `预留字段3数据`, visible: true },
+  { key: 9, label: `预留字段4数据`, visible: true },
+  { key: 10, label: `预留字段5数据`, visible: true },
+  { key: 11, label: `显示排序`, visible: true },
+  { key: 12, label: `备注`, visible: true },
+  { key: 13, label: `激活标识`, visible: true },
+  { key: 14, label: `创建部门`, visible: true },
+  { key: 15, label: `创建人`, visible: true },
+  { key: 16, label: `创建时间`, visible: true },
+  { key: 17, label: `更新人`, visible: true },
+  { key: 18, label: `更新时间`, visible: true }
+]);
+
+const initFormData: MasterDataDetailForm = {
+  masterDataDetailId: undefined,
+  masterDataId: undefined,
+  parentId: undefined,
+  ancestors: undefined,
+  dataDetailCode: undefined,
+  dataDetailName: undefined,
+  fieldData1: undefined,
+  fieldData2: undefined,
+  fieldData3: undefined,
+  fieldData4: undefined,
+  fieldData5: undefined,
+  displaySort: undefined,
+  remark: undefined,
+  activeFlag: undefined
+};
+const data = reactive<PageData<MasterDataDetailForm, MasterDataDetailQuery>>({
+  form: { ...initFormData },
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    masterDataDetailId: undefined,
+    masterDataId: undefined,
+    parentId: undefined,
+    ancestors: undefined,
+    dataDetailCode: undefined,
+    dataDetailName: undefined,
+    fieldData1: undefined,
+    fieldData2: undefined,
+    fieldData3: undefined,
+    fieldData4: undefined,
+    fieldData5: undefined,
+    displaySort: undefined,
+    activeFlag: undefined,
+    params: {}
+  },
+  rules: {
+    dataDetailCode: [
+      { required: true, message: '主数据明细编号不能为空', trigger: 'blur' }
+    ],
+    dataDetailName: [
+      { required: true, message: '主数据明细名称不能为空', trigger: 'blur' }
+    ],
+    activeFlag: [
+      { required: true, message: '激活标识不能为空', trigger: 'change' }
+    ]
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询主数据维护明细列表 */
+const getList = async () => {
+  loading.value = true;
+  const res = await listMasterDataDetail(queryParams.value);
+  masterDataDetailList.value = res.rows;
+  total.value = res.total;
+  loading.value = false;
+};
+
+/** 取消按钮 */
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+};
+
+/** 表单重置 */
+const reset = () => {
+  form.value = { ...initFormData };
+  masterDataDetailFormRef.value?.resetFields();
+};
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+};
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  handleQuery();
+};
+
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: MasterDataDetailVO[]) => {
+  ids.value = selection.map(item => item.masterDataDetailId);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+};
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+  reset();
+  dialog.visible = true;
+  dialog.title = '添加主数据维护明细';
+};
+
+/** 修改按钮操作 */
+const handleUpdate = async (row?: MasterDataDetailVO) => {
+  reset();
+  const _masterDataDetailId = row?.masterDataDetailId || ids.value[0];
+  const res = await getMasterDataDetail(_masterDataDetailId);
+  Object.assign(form.value, res.data);
+  dialog.visible = true;
+  dialog.title = '修改主数据维护明细';
+};
+
+/** 提交按钮 */
+const submitForm = () => {
+  masterDataDetailFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      if (form.value.masterDataDetailId) {
+        await updateMasterDataDetail(form.value).finally(() => buttonLoading.value = false);
+      } else {
+        await addMasterDataDetail(form.value).finally(() => buttonLoading.value = false);
+      }
+      proxy?.$modal.msgSuccess('操作成功');
+      dialog.visible = false;
+      await getList();
+    }
+  });
+};
+
+/** 删除按钮操作 */
+const handleDelete = async (row?: MasterDataDetailVO) => {
+  const _masterDataDetailIds = row?.masterDataDetailId || ids.value;
+  await proxy?.$modal.confirm('是否确认删除主数据维护明细编号为"' + _masterDataDetailIds + '"的数据项？').finally(() => loading.value = false);
+  await delMasterDataDetail(_masterDataDetailIds);
+  proxy?.$modal.msgSuccess('删除成功');
+  await getList();
+};
+
+/** 导出按钮操作 */
+const handleExport = () => {
+  proxy?.download('system/masterDataDetail/export', {
+    ...queryParams.value
+  }, `masterDataDetail_${new Date().getTime()}.xlsx`);
+};
+
+onMounted(() => {
+  getList();
+});
+</script>
diff --git a/src/views/wms/linkage/index.vue b/src/views/wms/linkage/index.vue
new file mode 100644
index 0000000..a62b46d
--- /dev/null
+++ b/src/views/wms/linkage/index.vue
@@ -0,0 +1,350 @@
+<template>
+  <div class="p-2">
+    <el-card shadow="never">
+      <el-form label-width="120px" label-position="right" :inline="true" :model="queryForm" class="demo-form-inline">
+        <el-form-item label="字段1">
+          <el-input v-model="queryForm.user" placeholder="字段1" clearable/>
+        </el-form-item>
+        <el-form-item label="字段2">
+          <el-select
+            v-model="queryForm.region"
+            placeholder="字段2"
+            clearable
+          >
+            <el-option label="选项1" value="shanghai"/>
+            <el-option label="选项2" value="beijing"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="字段3">
+          <el-date-picker
+            v-model="queryForm.date"
+            type="date"
+            placeholder="字段3"
+            clearable
+          />
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="query">查询</el-button>
+        </el-form-item>
+      </el-form>
+    </el-card>
+
+    <el-card style="margin-top: 8px" shadow="never">
+      <template #header>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button type="primary" plain icon="Plus" @click="parentTableAdd">新增</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="success" plain icon="Edit" :disabled="ids.length !== 1" @click="parentTableUpdate()">修改
+            </el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="danger" plain icon="Delete" :disabled="ids.length < 1" @click="parentTableDelete()">删除
+            </el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="warning" plain icon="Download" @click="handleExport">导出</el-button>
+          </el-col>
+          <right-toolbar v-model:showSearch="showSearch" :columns="columns" :search="true"
+                         @queryTable="getList"></right-toolbar>
+        </el-row>
+      </template>
+      <el-table :data="tableData" style="width: 100%" @cell-click="parentTableCellClick"
+                @selection-change="selectionChange" ref="parentTableRef">
+        <el-table-column type="selection" width="55"/>
+        <el-table-column label="Date" prop="date"/>
+        <el-table-column label="Date" prop="name"/>
+        <el-table-column label="Operations" fixed="right" width="200">
+          <template #default="scope">
+            <el-button size="small" @click.stop="viewDetails(scope.row)">
+              查看
+            </el-button>
+            <el-button size="small" @click.stop="parentTableUpdate(scope.row)">
+              修改
+            </el-button>
+            <el-button
+              size="small"
+              type="danger"
+              @click.stop="parentTableDelete(scope.row)"
+            >
+              删除
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-card>
+
+    <el-card style="margin-top: 8px" shadow="never">
+      <el-table :data="tableData1" style="width: 100%">
+        <el-table-column label="Date" prop="date"/>
+        <el-table-column label="Date" prop="name"/>
+        <el-table-column label="Operations" fixed="right" width="200">
+          <template #default="scope">
+            <el-button size="small" @click="handleEdit(scope.$index, scope.row)">
+              查看
+            </el-button>
+            <el-button size="small" @click="handleEdit(scope.$index, scope.row)">
+              修改
+            </el-button>
+            <el-button
+              size="small"
+              type="danger"
+              @click="handleDelete(scope.$index, scope.row)"
+            >
+              删除
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-card>
+
+    <el-dialog v-model="dialogVisible" :title="dialogTitle" width="100%" fullscreen>
+      <el-card shadow="never">
+        <el-form :model="dialogForm" :inline="true">
+          <el-form-item label="字段1" label-width="120px">
+            <el-input v-model="dialogForm.name" autocomplete="off"/>
+          </el-form-item>
+          <el-form-item label="字段2" label-width="120px">
+            <el-select v-model="dialogForm.region" placeholder="Please select a zone">
+              <el-option label="Zone No.1" value="shanghai"/>
+              <el-option label="Zone No.2" value="beijing"/>
+            </el-select>
+          </el-form-item>
+        </el-form>
+      </el-card>
+      <el-card style="margin-top: 8px" shadow="never">
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button type="primary" plain icon="Plus" @click="addDialogTableCell">新增</el-button>
+          </el-col>
+        </el-row>
+        <el-table :data="dialogtable" style="width: 100%">
+          <el-table-column label="字段1" prop="date">
+            <template #default="scope">
+              <el-select
+                v-model="scope.row.date"
+                placeholder="Select"
+                size="small"
+              >
+                <el-option
+                  label="1"
+                  value="1"
+                />
+                <el-option
+                  label="2"
+                  value="2"
+                />
+              </el-select>
+            </template>
+          </el-table-column>
+          <el-table-column label="字段2" prop="name">
+            <template #default="scope">
+              <el-input v-model="scope.row.name" style="width: 240px" placeholder="Please input" />
+            </template>
+          </el-table-column>
+          <el-table-column label="Operations" fixed="right" width="200">
+            <template #default="scope">
+              <el-button size="small" @click="handleEdit(scope.$index, scope.row)">
+                查看
+              </el-button>
+              <el-button size="small" @click="handleEdit(scope.$index, scope.row)">
+                修改
+              </el-button>
+              <el-button
+                size="small"
+                type="danger"
+                @click="handleDelete(scope.$index, scope.row)"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-card>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button @click="dialogVisible = false">关闭</el-button>
+          <el-button type="primary" @click="dialogSubmit">
+            确定
+          </el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="Linkage" lang="ts">
+
+import {reactive} from 'vue'
+import {ElMessage, ElMessageBox} from 'element-plus'
+
+interface User {
+  date: string
+  name: string
+  address: string
+}
+
+const dialogVisible = ref(false)
+const dialogTitle = ref('添加')
+const dialogForm = reactive({})
+
+const queryForm = reactive({
+  user: '',
+  region: '',
+  date: '',
+})
+const parentTableRef = ref()
+const tableData = ref([
+  {
+    date: '2016-05-03',
+    name: 'Tom',
+    address: 'No. 189, Grove St, Los Angeles',
+  },
+  {
+    date: '2016-05-02',
+    name: 'Tom',
+    address: 'No. 189, Grove St, Los Angeles',
+  },
+  {
+    date: '2016-05-04',
+    name: 'Tom',
+    address: 'No. 189, Grove St, Los Angeles',
+  },
+  {
+    date: '2016-05-01',
+    name: 'Tom',
+    address: 'No. 189, Grove St, Los Angeles',
+  },
+])
+const ids = ref([])
+const tableData1 = ref([
+  {
+    date: '2016-05-03',
+    name: 'Tom',
+    address: 'No. 189, Grove St, Los Angeles',
+  },
+  {
+    date: '2016-05-02',
+    name: 'Tom',
+    address: 'No. 189, Grove St, Los Angeles',
+  },
+  {
+    date: '2016-05-04',
+    name: 'Tom',
+    address: 'No. 189, Grove St, Los Angeles',
+  },
+  {
+    date: '2016-05-01',
+    name: 'Tom',
+    address: 'No. 189, Grove St, Los Angeles',
+  },
+])
+const dialogtable = ref([])
+
+const onSubmit = () => {
+  console.log('submit!')
+}
+
+const handleEdit = (index: number, row: User) => {
+  console.log(index, row)
+}
+const handleDelete = (index: number, row: User) => {
+  console.log(index, row)
+}
+const query = () => {
+  console.log(queryForm)
+  ids.value = []
+  parentTableRef.value.clearSelection()
+}
+
+// 父表格行点击
+const parentTableCellClick = (e) => {
+  console.log(e.date)
+  tableData1.value = tableData1.value.map(v => {
+    return {
+      ...v,
+      date: e.date
+    }
+  })
+}
+
+// 表格多选
+const selectionChange = (e) => {
+  ids.value = e.map(v => v.name)
+  console.log(ids.value)
+}
+// 查看
+const viewDetails = (e) => {
+  console.log(e)
+}
+
+// 父表格新增
+const parentTableAdd = () => {
+  dialogVisible.value = true
+}
+// 父表格修改
+const parentTableUpdate = (e) => {
+  let id = ref(null)
+  if (e) {
+    id.value = e.name
+  } else {
+    id.value = ids.value?.[0]
+  }
+  if (!id.value) return
+  dialogVisible.value = true
+}
+// 父表格删除
+const parentTableDelete = (e) => {
+  const delList = ref([])
+  if (e) {
+    delList.value = [e.name]
+  } else {
+    delList.value = ids.value
+  }
+  console.log(delList.value)
+  ElMessageBox.confirm(
+    '确定要删除这些数据吗?',
+    'Warning',
+    {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning',
+    }
+  )
+    .then(() => {
+      ElMessage({
+        type: 'success',
+        message: '删除完成',
+      })
+    })
+    .catch(() => {
+      ElMessage({
+        type: 'info',
+        message: '取消',
+      })
+    })
+
+}
+
+// 添加子表格行
+const addDialogTableCell = () => {
+  dialogtable.value.push({})
+}
+
+// dialog提交
+const dialogSubmit = () => {
+  console.log(dialogForm)
+  console.log(dialogtable.value)
+  dialogVisible.value = false
+}
+</script>
+<style>
+.demo-form-inline .el-input {
+  --el-input-width: 220px;
+}
+
+.demo-form-inline .el-select {
+  --el-select-width: 220px;
+}
+</style>