diff --git a/src/api/mes/base/baseFactory.js b/src/api/mes/base/baseFactory.js
index b7c4055..d134a59 100644
--- a/src/api/mes/base/baseFactory.js
+++ b/src/api/mes/base/baseFactory.js
@@ -42,3 +42,12 @@ export function delBaseFactory(objId) {
     method: 'delete'
   })
 }
+
+// 查询工厂管理下拉框列表
+export function getBaseFactoryList(query) {
+  return request({
+    url: '/mes/base/baseFactory/getBaseFactoryList',
+    method: 'get',
+    params: query
+  })
+}
diff --git a/src/views/mes/base/baseFactory/index.vue b/src/views/mes/base/baseFactory/index.vue
index cf24744..7201c3d 100644
--- a/src/views/mes/base/baseFactory/index.vue
+++ b/src/views/mes/base/baseFactory/index.vue
@@ -77,16 +77,16 @@
         </template>
       </el-table-column>
       <el-table-column label="备注" align="center" prop="remark" v-if="columns[5].visible"/>
-      <el-table-column label="创建人" align="center" prop="createdBy" v-if="columns[6].visible"/>
-      <el-table-column label="创建时间" align="center" prop="createdTime" width="180" v-if="columns[7].visible">
+      <el-table-column label="创建人" align="center" prop="createBy" v-if="columns[6].visible"/>
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180" v-if="columns[7].visible">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createdTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="更新人" align="center" prop="updatedBy" v-if="columns[8].visible"/>
-      <el-table-column label="更新时间" align="center" prop="updatedTime" width="180" v-if="columns[9].visible">
+      <el-table-column label="更新人" align="center" prop="updateBy" v-if="columns[8].visible"/>
+      <el-table-column label="更新时间" align="center" prop="updateTime" width="180" v-if="columns[9].visible">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.updatedTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+          <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">
@@ -193,10 +193,10 @@ export default {
         factoryCode: null,
         factoryName: null,
         factoryStatus: null,
-        createdBy: null,
-        createdTime: null,
-        updatedBy: null,
-        updatedTime: null
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null
       },
       // 表单参数
       form: {},
@@ -247,10 +247,10 @@ export default {
         factoryName: null,
         factoryStatus: '0',
         remark: null,
-        createdBy: null,
-        createdTime: null,
-        updatedBy: null,
-        updatedTime: null
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null
       }
       this.resetForm('form')
     },
diff --git a/src/views/mes/base/baseProductLine/index.vue b/src/views/mes/base/baseProductLine/index.vue
new file mode 100644
index 0000000..01ac303
--- /dev/null
+++ b/src/views/mes/base/baseProductLine/index.vue
@@ -0,0 +1,405 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+      <el-form-item label="产线名称" prop="productLineName">
+        <el-input
+          v-model="queryParams.productLineName"
+          placeholder="请输入产线名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+<!--      <el-form-item label="所属工厂" prop="plantCode">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.plantCode"-->
+<!--          placeholder="请输入所属工厂"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['mes/base:baseProductLine:add']"
+        >新增
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['mes/base:baseProductLine:edit']"
+        >修改
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['mes/base:baseProductLine:remove']"
+        >删除
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['mes/base:baseProductLine:export']"
+        >导出
+        </el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="baseProductLineList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center"/>
+      <el-table-column label="主键标识" align="center" prop="objId" v-if="columns[0].visible"/>
+      <el-table-column label="所属工厂" align="center" prop="factoryName" v-if="columns[4].visible"/>
+      <el-table-column label="产线编号" align="center" prop="productLineCode" v-if="columns[1].visible"/>
+      <el-table-column label="产线名称" align="center" prop="productLineName" v-if="columns[2].visible"/>
+      <el-table-column label="类别" align="center" prop="productLineType" v-if="columns[3].visible"/>
+      <el-table-column label="启用标识" align="center" prop="isFlag" v-if="columns[5].visible">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.is_flag" :value="scope.row.isFlag"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="创建人" align="center" prop="createBy" v-if="columns[6].visible"/>
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180" v-if="columns[7].visible">
+        <template slot-scope="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[8].visible"/>
+      <el-table-column label="更新时间" align="center" prop="updateTime" width="180" v-if="columns[9].visible">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="父级编号" align="center" prop="parentId" v-if="columns[10].visible"/>
+      <el-table-column label="工位类型" align="center" prop="stationType" v-if="columns[11].visible">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.station_type" :value="scope.row.stationType"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="SAP工作中心编号" align="center" prop="workCenterCode" v-if="columns[12].visible"/>
+      <el-table-column label="SAP工作中心描述" align="center" prop="workCenterName" v-if="columns[13].visible"/>
+      <el-table-column label="执行顺序" align="center" prop="executionSort" v-if="columns[14].visible"/>
+      <el-table-column label="日产能(米)" align="center" prop="capacityDay" v-if="columns[15].visible"/>
+      <el-table-column label="月产能(米)" align="center" prop="capacityMonth" v-if="columns[16].visible"/>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['mes/base:baseProductLine:edit']"
+          >修改
+          </el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['mes/base:baseProductLine:remove']"
+          >删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改产线信息对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+        <el-form-item label="所属工厂" prop="plantCode">
+          <el-select v-model="form.plantCode" placeholder="请选择所属工厂">
+            <el-option
+              v-for="item in factoryList"
+              :key="item.factoryCode"
+              :label="item.factoryName"
+              :value="item.factoryCode"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="产线编号" prop="productLineCode">
+          <el-input v-model="form.productLineCode" placeholder="请输入产线编号"/>
+        </el-form-item>
+        <el-form-item label="产线名称" prop="productLineName">
+          <el-input v-model="form.productLineName" placeholder="请输入产线名称"/>
+        </el-form-item>
+        <el-form-item label="启用标识" prop="isFlag">
+          <el-radio-group v-model="form.isFlag">
+            <el-radio
+              v-for="dict in dict.type.is_flag"
+              :key="dict.value"
+              :label="dict.value"
+            >{{ dict.label }}
+            </el-radio>
+          </el-radio-group>
+        </el-form-item>
+<!--        <el-form-item label="工位类型" prop="stationType">-->
+<!--          <el-radio-group v-model="form.stationType">-->
+<!--            <el-radio-->
+<!--              v-for="dict in dict.type.station_type"-->
+<!--              :key="dict.value"-->
+<!--              :label="dict.value"-->
+<!--            >{{ dict.label }}-->
+<!--            </el-radio>-->
+<!--          </el-radio-group>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="SAP工作中心编号" prop="workCenterCode">-->
+<!--          <el-input v-model="form.workCenterCode" placeholder="请输入SAP工作中心编号"/>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="SAP工作中心描述" prop="workCenterName">-->
+<!--          <el-input v-model="form.workCenterName" placeholder="请输入SAP工作中心描述"/>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="执行顺序" prop="executionSort">-->
+<!--          <el-input v-model="form.executionSort" placeholder="请输入执行顺序"/>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="日产能(米)" prop="capacityDay">-->
+<!--          <el-input v-model="form.capacityDay" placeholder="请输入日产能(米)"/>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="月产能(米)" prop="capacityMonth">-->
+<!--          <el-input v-model="form.capacityMonth" placeholder="请输入月产能(米)"/>-->
+<!--        </el-form-item>-->
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {
+  listBaseProductLine,
+  getBaseProductLine,
+  delBaseProductLine,
+  addBaseProductLine,
+  updateBaseProductLine
+} from '@/api/mes/base/baseProductLine'
+import { getBaseEnergyTypeList } from '@/api/ems/base/baseEnergyType'
+import { getBaseFactoryList } from '@/api/mes/base/baseFactory'
+
+export default {
+  name: 'BaseProductLine',
+  dicts: ['station_type', 'is_flag'],
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 产线信息表格数据
+      baseProductLineList: [],
+      // 弹出层标题
+      title: '',
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        productLineCode: null,
+        productLineName: null,
+        productLineType: 1,
+        plantCode: null,
+        isFlag: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
+        parentId: null,
+        stationType: null,
+        workCenterCode: null,
+        workCenterName: null,
+        executionSort: null,
+        capacityDay: null,
+        capacityMonth: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        objId: [
+          { required: true, message: '主键标识不能为空', trigger: 'blur' }
+        ]
+      },
+      columns: [
+        { key: 0, label: `主键标识`, visible: false },
+        { key: 1, label: `产线编号`, visible: true },
+        { key: 2, label: `产线名称`, visible: true },
+        { key: 3, label: `类别`, visible: false },
+        { key: 4, label: `所属工厂`, visible: true },
+        { key: 5, label: `启用标识`, visible: true },
+        { key: 6, label: `创建人`, visible: false },
+        { key: 7, label: `创建时间`, visible: true },
+        { key: 8, label: `更新人`, visible: false },
+        { key: 9, label: `更新时间`, visible: true },
+        { key: 10, label: `父级编号`, visible: false },
+        { key: 11, label: `工位类型`, visible: false },
+        { key: 12, label: `SAP工作中心编号`, visible: false },
+        { key: 13, label: `SAP工作中心描述`, visible: false },
+        { key: 14, label: `执行顺序`, visible: false },
+        { key: 15, label: `日产能(米)`, visible: false },
+        { key: 16, label: `月产能(米)`, visible: false }
+      ],
+      // 工厂选项
+      factoryList: []
+    }
+  },
+  created() {
+    getBaseFactoryList({}).then(response => {
+      this.factoryList = response.data
+    })
+    this.getList()
+  },
+  methods: {
+    /** 查询产线信息列表 */
+    getList() {
+      this.loading = true
+      listBaseProductLine(this.queryParams).then(response => {
+        this.baseProductLineList = response.rows
+        this.total = response.total
+        this.loading = false
+      })
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false
+      this.reset()
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        objId: null,
+        productLineCode: null,
+        productLineName: null,
+        productLineType: 1,
+        plantCode: null,
+        isFlag: '0',
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
+        parentId: null,
+        stationType: null,
+        workCenterCode: null,
+        workCenterName: null,
+        executionSort: null,
+        capacityDay: null,
+        capacityMonth: null
+      }
+      this.resetForm('form')
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1
+      this.getList()
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm('queryForm')
+      this.handleQuery()
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.objId)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset()
+      this.open = true
+      this.title = '添加产线信息'
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset()
+      const objId = row.objId || this.ids
+      getBaseProductLine(objId).then(response => {
+        this.form = response.data
+        this.open = true
+        this.title = '修改产线信息'
+      })
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs['form'].validate(valid => {
+        if (valid) {
+          if (this.form.objId != null) {
+            updateBaseProductLine(this.form).then(response => {
+              this.$modal.msgSuccess('修改成功')
+              this.open = false
+              this.getList()
+            })
+          } else {
+            addBaseProductLine(this.form).then(response => {
+              this.$modal.msgSuccess('新增成功')
+              this.open = false
+              this.getList()
+            })
+          }
+        }
+      })
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const objIds = row.objId || this.ids
+      this.$modal.confirm('是否确认删除产线信息编号为"' + objIds + '"的数据项？').then(function() {
+        return delBaseProductLine(objIds)
+      }).then(() => {
+        this.getList()
+        this.$modal.msgSuccess('删除成功')
+      }).catch(() => {
+      })
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('mes/base/baseProductLine/export', {
+        ...this.queryParams
+      }, `baseProductLine_${new Date().getTime()}.xlsx`)
+    }
+  }
+}
+</script>