diff --git a/src/views/base/productLine/index.vue b/src/views/base/productLine/index.vue
index e84aedc..6511555 100644
--- a/src/views/base/productLine/index.vue
+++ b/src/views/base/productLine/index.vue
@@ -9,16 +9,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="产线类别" prop="productLineType">
-        <el-select v-model="queryParams.productLineType" placeholder="请选择产线类别" clearable>
-          <el-option
-            v-for="dict in dict.type.line_type"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </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>
@@ -76,11 +66,11 @@
       <el-table-column label="主键标识" align="center" prop="objId" v-if="columns[0].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">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.line_type" :value="scope.row.productLineType"/>
-        </template>
-      </el-table-column>
+<!--      <el-table-column label="产线类别" align="center" prop="productLineType" v-if="columns[3].visible">-->
+<!--        <template slot-scope="scope">-->
+<!--          <dict-tag :options="dict.type.line_type" :value="scope.row.productLineType"/>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
       <el-table-column label="所属工厂" align="center" prop="plantName" v-if="columns[4].visible"/>
       <el-table-column label="启用标识" align="center" prop="isFlag" v-if="columns[5].visible" >
         <template slot-scope="scope">
@@ -136,16 +126,16 @@
         <el-form-item label="产线名称" prop="productLineName">
           <el-input v-model="form.productLineName" placeholder="请输入产线名称" />
         </el-form-item>
-        <el-form-item label="产线类别" prop="productLineType">
-          <el-select v-model="form.productLineType" placeholder="请选择产线类别">
-            <el-option
-              v-for="dict in dict.type.line_type"
-              :key="dict.value"
-              :label="dict.label"
-              :value="parseInt(dict.value)"
-            ></el-option>
-          </el-select>
-        </el-form-item>
+<!--        <el-form-item label="产线类别" prop="productLineType">-->
+<!--          <el-select v-model="form.productLineType" placeholder="请选择产线类别">-->
+<!--            <el-option-->
+<!--              v-for="dict in dict.type.line_type"-->
+<!--              :key="dict.value"-->
+<!--              :label="dict.label"-->
+<!--              :value="parseInt(dict.value)"-->
+<!--            ></el-option>-->
+<!--          </el-select>-->
+<!--        </el-form-item>-->
         <el-form-item label="所属工厂">
           <el-select v-model="form.plantCode" placeholder="请选择所属工厂">
             <el-option
@@ -207,7 +197,7 @@ export default {
         pageSize: 10,
         productLineCode: null,
         productLineName: null,
-        productLineType: null,
+        productLineType: 1,
         plantCode: null,
         isFlag: null,
         createdBy: null,
@@ -263,7 +253,7 @@ export default {
         objId: null,
         productLineCode: null,
         productLineName: null,
-        productLineType: null,
+        productLineType: 1,
         plantCode: null,
         isFlag: 0,
         createdBy: null,
diff --git a/src/views/base/productStation/index.vue b/src/views/base/productStation/index.vue
new file mode 100644
index 0000000..5d87384
--- /dev/null
+++ b/src/views/base/productStation/index.vue
@@ -0,0 +1,354 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="工位名称" prop="productLineName">
+        <el-input
+          v-model="queryParams.productLineName"
+          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="['base:productLine: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="['base:productLine: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="['base:productLine: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="['base:productLine:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="productStationList" @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="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">-->
+<!--        <template slot-scope="scope">-->
+<!--          <dict-tag :options="dict.type.line_type" :value="scope.row.productLineType"/>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+      <el-table-column label="所属工厂" align="center" prop="plantName" v-if="columns[4].visible"/>
+      <el-table-column label="所属产线" align="center" prop="parentName" v-if="columns[10].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="createdBy" v-if="columns[6].visible"/>
+      <el-table-column label="创建时间" align="center" prop="createdTime" width="180" v-if="columns[7].visible">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createdTime, '{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">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.updatedTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+        </template>
+      </el-table-column>
+      <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="['base:productLine:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['base:productLine: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="80px">
+        <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="productLineType">-->
+<!--          <el-select v-model="form.productLineType" placeholder="请选择工位类别">-->
+<!--            <el-option-->
+<!--              v-for="dict in dict.type.line_type"-->
+<!--              :key="dict.value"-->
+<!--              :label="dict.label"-->
+<!--              :value="parseInt(dict.value)"-->
+<!--            ></el-option>-->
+<!--          </el-select>-->
+<!--        </el-form-item>-->
+        <el-form-item label="所属工厂">
+          <el-select v-model="form.plantCode" placeholder="请选择所属工厂">
+            <el-option
+              v-for="item in factoryList"
+              :key="item.factoryCode"
+              :label="item.factoryName"
+              :value="item.factoryCode"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="所属产线">
+          <el-select v-model="form.parentId" placeholder="请选择产线工位">
+            <el-option
+              v-for="item in productLineList"
+              :key="item.productLineCode"
+              :label="item.productLineName"
+              :value="item.productLineCode"
+            ></el-option>
+          </el-select>
+        </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="parseInt(dict.value)"
+            >{{dict.label}}</el-radio>
+          </el-radio-group>
+        </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 { listProductLine, getProductLine, delProductLine, addProductLine, updateProductLine } from "@/api/base/productLine";
+import { findFactoryList } from "@/api/base/factory";
+import { findProductLineList } from "@/api/base/productLine";
+
+export default {
+  name: "ProductLine",
+  dicts: ['line_type', 'is_flag'],
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 工位信息表格数据
+      productStationList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        productLineCode: null,
+        productLineName: null,
+        productLineType: 2,
+        plantCode: null,
+        isFlag: null,
+        createdBy: null,
+        createdTime: null,
+        updatedBy: null,
+        updatedTime: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      },
+      columns: [
+            { key: 0, label: `主键标识`, visible: false },
+            { key: 1, label: `工位编号`, 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: `创建人`, visible: true },
+            { key: 7, label: `创建时间`, visible: true },
+            { key: 8, label: `更新人`, visible: true },
+            { key: 9, label: `更新时间`, visible: true },
+            { key: 10, label: `所属产线`, visible: true },
+        ],
+      // 工厂选项
+      factoryList: [],
+      // 产线选项
+      productLineList: [],
+    };
+  },
+  created() {
+    this.getList();
+    findFactoryList().then(response => {
+      this.factoryList = response.data;
+    });
+    findProductLineList({productLineType: 1}).then(response => {
+      this.productLineList = response.data;
+    });
+  },
+  methods: {
+    /** 查询工位信息列表 */
+    getList() {
+      this.loading = true;
+      listProductLine(this.queryParams).then(response => {
+        this.productStationList = 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: 2,
+        plantCode: null,
+        isFlag: 0,
+        createdBy: null,
+        createdTime: null,
+        updatedBy: null,
+        updatedTime: 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
+      getProductLine(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) {
+            updateProductLine(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addProductLine(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 delProductLine(objIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('base/productLine/export', {
+        ...this.queryParams
+      }, `productLine_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>