diff --git a/src/api/mes/baseProdLineInfo/index.ts b/src/api/mes/baseProdLineInfo/index.ts
new file mode 100644
index 0000000..fb9a7e5
--- /dev/null
+++ b/src/api/mes/baseProdLineInfo/index.ts
@@ -0,0 +1,77 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { BaseProdLineInfoVO, BaseProdLineInfoForm, BaseProdLineInfoQuery } from '@/api/mes/baseProdLineInfo/types';
+
+/**
+ * 查询产线信息列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listBaseProdLineInfo = (query?: BaseProdLineInfoQuery): AxiosPromise<BaseProdLineInfoVO[]> => {
+  return request({
+    url: '/mes/baseProdLineInfo/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询产线信息详细
+ * @param prodLineId
+ */
+export const getBaseProdLineInfo = (prodLineId: string | number): AxiosPromise<BaseProdLineInfoVO> => {
+  return request({
+    url: '/mes/baseProdLineInfo/' + prodLineId,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增产线信息
+ * @param data
+ */
+export const addBaseProdLineInfo = (data: BaseProdLineInfoForm) => {
+  return request({
+    url: '/mes/baseProdLineInfo',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改产线信息
+ * @param data
+ */
+export const updateBaseProdLineInfo = (data: BaseProdLineInfoForm) => {
+  return request({
+    url: '/mes/baseProdLineInfo',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除产线信息
+ * @param prodLineId
+ */
+export const delBaseProdLineInfo = (prodLineId: string | number | Array<string | number>) => {
+  return request({
+    url: '/mes/baseProdLineInfo/' + prodLineId,
+    method: 'delete'
+  });
+};
+
+
+/**
+ * 查询产线信息下拉框列表
+ * @param query
+ * @returns {*}
+ */
+export function getProdLineList(query) {
+  return request({
+    url: '/mes/baseProdLineInfo/getProdLineList',
+    method: 'get',
+    params: query
+  });
+};
diff --git a/src/api/mes/baseProdLineInfo/types.ts b/src/api/mes/baseProdLineInfo/types.ts
new file mode 100644
index 0000000..e3b586c
--- /dev/null
+++ b/src/api/mes/baseProdLineInfo/types.ts
@@ -0,0 +1,156 @@
+export interface BaseProdLineInfoVO {
+  /**
+   * 产线ID
+   */
+  prodLineId: string | number;
+
+  /**
+   * 租户编号
+   */
+  tenantId: string | number;
+
+  /**
+   * 产线编号
+   */
+  prodLineCode: string;
+
+  /**
+   * 产线名称
+   */
+  prodLineName: string;
+
+  /**
+   * 产线类型
+   */
+  prodLineType: string;
+
+  /**
+   * 所属车间
+   */
+  workshopId: string | number;
+
+  /**
+   * 激活标识（1是 0否）
+   */
+  activeFlag: string;
+
+  /**
+   * 备注
+   */
+  remark: string;
+
+  /**
+   * 创建部门
+   */
+  createDept: number;
+
+  /**
+   * 创建人
+   */
+  createBy: number;
+
+  /**
+   * 创建时间
+   */
+  createTime: string;
+
+  /**
+   * 更新人
+   */
+  updateBy: number;
+
+  /**
+   * 更新时间
+   */
+  updateTime: string;
+
+}
+
+export interface BaseProdLineInfoForm extends BaseEntity {
+  /**
+   * 产线ID
+   */
+  prodLineId?: string | number;
+
+  /**
+   * 租户编号
+   */
+  tenantId?: string | number;
+
+  /**
+   * 产线编号
+   */
+  prodLineCode?: string;
+
+  /**
+   * 产线名称
+   */
+  prodLineName?: string;
+
+  /**
+   * 产线类型
+   */
+  prodLineType?: string;
+
+  /**
+   * 所属车间
+   */
+  workshopId?: string | number;
+
+  /**
+   * 激活标识（1是 0否）
+   */
+  activeFlag?: string;
+
+  /**
+   * 备注
+   */
+  remark?: string;
+
+}
+
+export interface BaseProdLineInfoQuery extends PageQuery {
+
+  /**
+   * 产线ID
+   */
+  prodLineId?: string | number;
+
+  /**
+   * 租户编号
+   */
+  tenantId?: string | number;
+
+  /**
+   * 产线编号
+   */
+  prodLineCode?: string;
+
+  /**
+   * 产线名称
+   */
+  prodLineName?: string;
+
+  /**
+   * 产线类型
+   */
+  prodLineType?: string;
+
+  /**
+   * 所属车间
+   */
+  workshopId?: string | number;
+
+  /**
+   * 激活标识（1是 0否）
+   */
+  activeFlag?: string;
+
+    /**
+     * 日期范围参数
+     */
+    params?: any;
+}
+
+
+
diff --git a/src/api/mes/baseWorkshopInfo/index.ts b/src/api/mes/baseWorkshopInfo/index.ts
index 11f5dff..ea5395d 100644
--- a/src/api/mes/baseWorkshopInfo/index.ts
+++ b/src/api/mes/baseWorkshopInfo/index.ts
@@ -60,3 +60,16 @@ export const delBaseWorkshopInfo = (workshopId: string | number | Array<string |
     method: 'delete'
   });
 };
+
+/**
+ * 查询车间信息下拉框列表
+ * @param query
+ * @returns {*}
+ */
+export function getWorkshopList(query) {
+  return request({
+    url: '/mes/baseWorkshopInfo/getWorkshopList',
+    method: 'get',
+    params: query
+  });
+};
diff --git a/src/views/mes/baseProdLineInfo/index.vue b/src/views/mes/baseProdLineInfo/index.vue
new file mode 100644
index 0000000..c4ba37d
--- /dev/null
+++ b/src/views/mes/baseProdLineInfo/index.vue
@@ -0,0 +1,340 @@
+<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="prodLineName">
+              <el-input v-model="queryParams.prodLineName" placeholder="请输入产线名称" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+<!--            <el-form-item label="产线类型" prop="prodLineType">-->
+<!--              <el-select v-model="queryParams.prodLineType" placeholder="请选择产线类型" clearable >-->
+<!--                <el-option v-for="dict in prod_line_type" :key="dict.value" :label="dict.label" :value="dict.value"/>-->
+<!--              </el-select>-->
+<!--            </el-form-item>-->
+            <el-form-item label="所属车间" prop="workshopId">
+              <el-select v-model="queryParams.workshopId" placeholder="请选择所属车间" clearable @keyup.enter="handleQuery" >
+                <el-option
+                  v-for="item in workshopInfoList"
+                  :key="item.workshopId"
+                  :label="item.workshopName"
+                  :value="item.workshopId"
+                />
+              </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="['mes:baseProdLineInfo:add']">新增</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['mes:baseProdLineInfo:edit']">修改</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['mes:baseProdLineInfo:remove']">删除</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['mes:baseProdLineInfo: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="baseProdLineInfoList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="产线ID" align="center" prop="prodLineId" v-if="columns[0].visible"/>
+        <el-table-column label="租户编号" align="center" prop="tenantId" v-if="columns[1].visible"/>
+        <el-table-column label="产线编号" align="center" prop="prodLineCode" v-if="columns[2].visible"/>
+        <el-table-column label="产线名称" align="center" prop="prodLineName" v-if="columns[3].visible"/>
+        <el-table-column label="产线类型" align="center" prop="prodLineType" v-if="columns[4].visible">
+          <template #default="scope">
+            <dict-tag :options="prod_line_type" :value="scope.row.prodLineType"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="所属车间" align="center" prop="workshopName" v-if="columns[5].visible"/>
+        <el-table-column label="激活标识" align="center" prop="activeFlag" v-if="columns[6].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[7].visible"/>
+        <el-table-column label="创建部门" align="center" prop="createDept" v-if="columns[8].visible"/>
+        <el-table-column label="创建人" align="center" prop="createBy" v-if="columns[9].visible"/>
+        <el-table-column label="创建时间" align="center" prop="createTime" width="180" v-if="columns[10].visible">
+          <template #default="scope">
+            <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="更新人" align="center" prop="updateBy" v-if="columns[11].visible"/>
+        <el-table-column label="更新时间" align="center" prop="updateTime" width="180" v-if="columns[12].visible">
+          <template #default="scope">
+            <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+          </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="['mes:baseProdLineInfo:edit']"></el-button>
+            </el-tooltip>
+            <el-tooltip content="删除" placement="top">
+              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['mes:baseProdLineInfo: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="baseProdLineInfoFormRef" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="产线编号" prop="prodLineCode">
+          <el-input v-model="form.prodLineCode" placeholder="请输入产线编号" />
+        </el-form-item>
+        <el-form-item label="产线名称" prop="prodLineName">
+          <el-input v-model="form.prodLineName" placeholder="请输入产线名称" />
+        </el-form-item>
+        <el-form-item label="产线类型" prop="prodLineType">
+          <el-select v-model="form.prodLineType" placeholder="请选择产线类型">
+            <el-option
+                v-for="dict in prod_line_type"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="所属车间" prop="workshopId">
+          <el-select v-model="form.workshopId" placeholder="请选择所属车间">
+            <el-option
+              v-for="item in workshopInfoList"
+              :key="item.workshopId"
+              :label="item.workshopName"
+              :value="item.workshopId"
+            />
+          </el-select>
+        </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="BaseProdLineInfo" lang="ts">
+import { listBaseProdLineInfo, getBaseProdLineInfo, delBaseProdLineInfo, addBaseProdLineInfo, updateBaseProdLineInfo } from '@/api/mes/baseProdLineInfo';
+import { BaseProdLineInfoVO, BaseProdLineInfoQuery, BaseProdLineInfoForm } from '@/api/mes/baseProdLineInfo/types';
+import { getWorkshopList } from '@/api/mes/baseWorkshopInfo';
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { active_flag, prod_line_type } = toRefs<any>(proxy?.useDict('active_flag', 'prod_line_type'));
+
+const baseProdLineInfoList = ref<BaseProdLineInfoVO[]>([]);
+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 baseProdLineInfoFormRef = ref<ElFormInstance>();
+let workshopInfoList = ref([]);
+
+const dialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+
+/** 查询车间下拉树结构 */
+const getWorkshopListSelect = async () => {
+  let res = await getWorkshopList(null);
+  workshopInfoList.value = res.data;
+  console.log("workshopInfoList.value",workshopInfoList.value, res);
+};
+
+// 列显隐信息
+const columns = ref<FieldOption[]>([
+        { key: 0, label: `产线ID`, visible: false },
+        { key: 1, label: `租户编号`, visible: false },
+        { key: 2, label: `产线编号`, visible: true },
+        { key: 3, label: `产线名称`, visible: true },
+        { key: 4, label: `产线类型`, visible: true },
+        { key: 5, label: `所属车间`, visible: true },
+        { key: 6, label: `激活标识`, visible: true },
+        { key: 7, label: `备注`, visible: true },
+        { key: 8, label: `创建部门`, visible: false },
+        { key: 9, label: `创建人`, visible: false },
+        { key: 10, label: `创建时间`, visible: true },
+        { key: 11, label: `更新人`, visible: false },
+        { key: 12, label: `更新时间`, visible: false },
+]);
+
+const initFormData: BaseProdLineInfoForm = {
+  prodLineId: undefined,
+  tenantId: undefined,
+  prodLineCode: undefined,
+  prodLineName: undefined,
+  prodLineType: undefined,
+  workshopId: undefined,
+  activeFlag: '1',
+  remark: undefined,
+}
+const data = reactive<PageData<BaseProdLineInfoForm, BaseProdLineInfoQuery>>({
+  form: {...initFormData},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    prodLineId: undefined,
+    tenantId: undefined,
+    prodLineCode: undefined,
+    prodLineName: undefined,
+    prodLineType: undefined,
+    workshopId: undefined,
+    activeFlag: undefined,
+    params: {
+    }
+  },
+  rules: {
+    prodLineCode: [
+      { required: true, message: "产线编号不能为空", trigger: "blur" }
+    ],
+    prodLineName: [
+      { required: true, message: "产线名称不能为空", trigger: "blur" }
+    ],
+    prodLineType: [
+      { required: true, message: "产线类型不能为空", trigger: "change" }
+    ],
+    workshopId: [
+      { 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 listBaseProdLineInfo(queryParams.value);
+  baseProdLineInfoList.value = res.rows;
+  total.value = res.total;
+  loading.value = false;
+}
+
+/** 取消按钮 */
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+}
+
+/** 表单重置 */
+const reset = () => {
+  form.value = {...initFormData};
+  baseProdLineInfoFormRef.value?.resetFields();
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  handleQuery();
+}
+
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: BaseProdLineInfoVO[]) => {
+  ids.value = selection.map(item => item.prodLineId);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+}
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+  reset();
+  dialog.visible = true;
+  dialog.title = "添加产线信息";
+}
+
+/** 修改按钮操作 */
+const handleUpdate = async (row?: BaseProdLineInfoVO) => {
+  reset();
+  const _prodLineId = row?.prodLineId || ids.value[0]
+  const res = await getBaseProdLineInfo(_prodLineId);
+  Object.assign(form.value, res.data);
+  dialog.visible = true;
+  dialog.title = "修改产线信息";
+}
+
+/** 提交按钮 */
+const submitForm = () => {
+  baseProdLineInfoFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      if (form.value.prodLineId) {
+        await updateBaseProdLineInfo(form.value).finally(() =>  buttonLoading.value = false);
+      } else {
+        await addBaseProdLineInfo(form.value).finally(() =>  buttonLoading.value = false);
+      }
+      proxy?.$modal.msgSuccess("操作成功");
+      dialog.visible = false;
+      await getList();
+    }
+  });
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (row?: BaseProdLineInfoVO) => {
+  const _prodLineIds = row?.prodLineId || ids.value;
+  await proxy?.$modal.confirm('是否确认删除产线信息编号为"' + _prodLineIds + '"的数据项？').finally(() => loading.value = false);
+  await delBaseProdLineInfo(_prodLineIds);
+  proxy?.$modal.msgSuccess("删除成功");
+  await getList();
+}
+
+/** 导出按钮操作 */
+const handleExport = () => {
+  proxy?.download('mes/baseProdLineInfo/export', {
+    ...queryParams.value
+  }, `baseProdLineInfo_${new Date().getTime()}.xlsx`)
+}
+
+onMounted(() => {
+  getWorkshopListSelect();// 初始化车间数据
+  getList();
+});
+</script>