diff --git a/src/api/base/materialinfo.js b/src/api/base/materialinfo.js
new file mode 100644
index 0000000..52e4da3
--- /dev/null
+++ b/src/api/base/materialinfo.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询物料信息列表
+export function listMaterialInfo(query) {
+  return request({
+    url: '/base/materialInfo/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询物料信息详细
+export function getMaterialInfo(objId) {
+  return request({
+    url: '/base/materialInfo/' + objId,
+    method: 'get'
+  })
+}
+
+// 新增物料信息
+export function addMaterialInfo(data) {
+  return request({
+    url: '/base/materialInfo',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改物料信息
+export function updateMaterialInfo(data) {
+  return request({
+    url: '/base/materialInfo',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除物料信息
+export function delMaterialInfo(objId) {
+  return request({
+    url: '/base/materialInfo/' + objId,
+    method: 'delete'
+  })
+}
diff --git a/src/api/base/productLine.js b/src/api/base/productLine.js
new file mode 100644
index 0000000..b9ba830
--- /dev/null
+++ b/src/api/base/productLine.js
@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询产线信息列表
+export function listProductLine(query) {
+  return request({
+    url: '/base/productLine/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询产线信息列表
+export function findProductLineList(query) {
+  return request({
+    url: '/base/productLine/findProductLineList',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询产线信息详细
+export function getProductLine(objId) {
+  return request({
+    url: '/base/productLine/' + objId,
+    method: 'get'
+  })
+}
+
+// 新增产线信息
+export function addProductLine(data) {
+  return request({
+    url: '/base/productLine',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改产线信息
+export function updateProductLine(data) {
+  return request({
+    url: '/base/productLine',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除产线信息
+export function delProductLine(objId) {
+  return request({
+    url: '/base/productLine/' + objId,
+    method: 'delete'
+  })
+}
diff --git a/src/api/base/productline.js b/src/api/base/productline.js
deleted file mode 100644
index 55ad040..0000000
--- a/src/api/base/productline.js
+++ /dev/null
@@ -1,44 +0,0 @@
-import request from '@/utils/request'
-
-// 查询产线信息列表
-export function listProductline(query) {
-  return request({
-    url: '/base/productline/list',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查询产线信息详细
-export function getProductline(objid) {
-  return request({
-    url: '/base/productline/' + objid,
-    method: 'get'
-  })
-}
-
-// 新增产线信息
-export function addProductline(data) {
-  return request({
-    url: '/base/productline',
-    method: 'post',
-    data: data
-  })
-}
-
-// 修改产线信息
-export function updateProductline(data) {
-  return request({
-    url: '/base/productline',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除产线信息
-export function delProductline(objid) {
-  return request({
-    url: '/base/productline/' + objid,
-    method: 'delete'
-  })
-}
diff --git a/src/views/base/materialinfo/index.vue b/src/views/base/materialinfo/index.vue
new file mode 100644
index 0000000..f9b326e
--- /dev/null
+++ b/src/views/base/materialinfo/index.vue
@@ -0,0 +1,460 @@
+<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="materialName">
+        <el-input
+          v-model="queryParams.materialName"
+          placeholder="请输入物料名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="物料大类" prop="materialCategories">
+        <el-select v-model="queryParams.materialCategories" placeholder="请选择物料大类" clearable>
+          <el-option
+            v-for="dict in dict.type.material_categories"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+<!--      <el-form-item label="物料小类" prop="materialSubclass">-->
+<!--        <el-select v-model="queryParams.materialSubclass" placeholder="请选择物料小类" clearable>-->
+<!--          <el-option-->
+<!--            v-for="dict in dict.type.material_subclass"-->
+<!--            :key="dict.value"-->
+<!--            :label="dict.label"-->
+<!--            :value="dict.value"-->
+<!--          />-->
+<!--        </el-select>-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="物料类型" prop="materialType">-->
+<!--        <el-select v-model="queryParams.materialType" placeholder="请选择物料类型" clearable>-->
+<!--          <el-option-->
+<!--            v-for="dict in dict.type.material_type"-->
+<!--            :key="dict.value"-->
+<!--            :label="dict.label"-->
+<!--            :value="dict.value"-->
+<!--          />-->
+<!--        </el-select>-->
+<!--      </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 label="产线工位" prop="productLineCode">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.productLineCode"-->
+<!--          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:materialInfo: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:materialInfo: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:materialInfo: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:materialInfo:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="materialInfoList" @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="materialCode" v-if="columns[1].visible"/>
+      <el-table-column label="物料名称" align="center" prop="materialName" v-if="columns[2].visible"/>
+      <el-table-column label="物料大类" align="center" prop="materialCategories" v-if="columns[3].visible">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.material_categories" :value="scope.row.materialCategories"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="物料小类" align="center" prop="materialSubclass" v-if="columns[4].visible">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.material_subclass" :value="scope.row.materialSubclass"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="物料类型" align="center" prop="materialType" v-if="columns[5].visible">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.material_type" :value="scope.row.materialType"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="计量单位" align="center" prop="materialUnit" v-if="columns[6].visible"/>
+      <el-table-column label="MATKL" align="center" prop="materialMatkl" v-if="columns[7].visible"/>
+      <el-table-column label="物料规格" align="center" prop="materialSpecifications" v-if="columns[8].visible"/>
+      <el-table-column label="所属工厂" align="center" prop="plantName" v-if="columns[9].visible"/>
+      <el-table-column label="产线工位" align="center" prop="productLineName" v-if="columns[10].visible"/>
+      <el-table-column label="启用标识" align="center" prop="isFlag" v-if="columns[11].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[12].visible"/>
+      <el-table-column label="创建时间" align="center" prop="createdTime" width="180" v-if="columns[13].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[14].visible"/>
+      <el-table-column label="更新时间" align="center" prop="updatedTime" width="180" v-if="columns[15].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:materialInfo:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['base:materialInfo: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="materialCode">
+          <el-input v-model="form.materialCode" placeholder="请输入物料编码" />
+        </el-form-item>
+        <el-form-item label="物料名称" prop="materialName">
+          <el-input v-model="form.materialName" placeholder="请输入物料名称" />
+        </el-form-item>
+        <el-form-item label="物料大类" prop="materialCategories">
+          <el-select v-model="form.materialCategories" placeholder="请选择物料大类">
+            <el-option
+              v-for="dict in dict.type.material_categories"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="物料小类" prop="materialSubclass">
+          <el-select v-model="form.materialSubclass" placeholder="请选择物料小类">
+            <el-option
+              v-for="dict in dict.type.material_subclass"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="物料类型" prop="materialType">
+          <el-select v-model="form.materialType" placeholder="请选择物料类型">
+            <el-option
+              v-for="dict in dict.type.material_type"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="计量单位" prop="materialUnit">
+          <el-input v-model="form.materialUnit" placeholder="请输入计量单位" />
+        </el-form-item>
+        <el-form-item label="MATKL" prop="materialMatkl">
+          <el-input v-model="form.materialMatkl" placeholder="请输入MATKL" />
+        </el-form-item>
+        <el-form-item label="物料规格" prop="materialSpecifications">
+          <el-input v-model="form.materialSpecifications" placeholder="请输入物料规格" />
+        </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.productLineCode" 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 { listMaterialInfo, getMaterialInfo, delMaterialInfo, addMaterialInfo, updateMaterialInfo } from "@/api/base/materialInfo";
+import { findFactoryList } from "@/api/base/factory";
+import { findProductLineList } from "@/api/base/productLine";
+
+export default {
+  name: "MaterialInfo",
+  dicts: ['material_subclass', 'material_type', 'is_flag', 'material_categories'],
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 物料信息表格数据
+      materialInfoList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        materialCode: null,
+        materialName: null,
+        materialCategories: null,
+        materialSubclass: null,
+        materialType: null,
+        materialUnit: null,
+        materialMatkl: null,
+        materialSpecifications: null,
+        plantCode: null,
+        productLineCode: 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: `MATKL`, visible: true },
+        { key: 8, label: `物料规格`, visible: true },
+        { key: 9, label: `所属工厂`, visible: true },
+        { key: 10, label: `产线工位`, visible: true },
+        { key: 11, label: `启用标识`, visible: true },
+        { key: 12, label: `创建人`, visible: false },
+        { key: 13, label: `创建时间`, visible: false },
+        { key: 14, label: `更新人`, visible: false },
+        { key: 15, label: `更新时间`, visible: false },
+      ],
+      // 工厂选项
+      factoryList: [],
+      // 产线选项
+      productLineList: [],
+    };
+  },
+  created() {
+    this.getList();
+    findFactoryList().then(response => {
+      this.factoryList = response.data;
+    });
+    findProductLineList().then(response => {
+      this.productLineList = response.data;
+    });
+  },
+  methods: {
+    /** 查询物料信息列表 */
+    getList() {
+      this.loading = true;
+      listMaterialInfo(this.queryParams).then(response => {
+        this.materialInfoList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        objId: null,
+        materialCode: null,
+        materialName: null,
+        materialCategories: null,
+        materialSubclass: null,
+        materialType: null,
+        materialUnit: null,
+        materialMatkl: null,
+        materialSpecifications: null,
+        plantCode: null,
+        productLineCode: 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
+      getMaterialInfo(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) {
+            updateMaterialInfo(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addMaterialInfo(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 delMaterialInfo(objIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('base/materialInfo/export', {
+        ...this.queryParams
+      }, `materialInfo_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>
diff --git a/src/views/base/productline/index.vue b/src/views/base/productLine/index.vue
similarity index 76%
rename from src/views/base/productline/index.vue
rename to src/views/base/productLine/index.vue
index e3e0dd4..e84aedc 100644
--- a/src/views/base/productline/index.vue
+++ b/src/views/base/productLine/index.vue
@@ -1,24 +1,16 @@
 <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="productlineCode">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.productlineCode"-->
-<!--          placeholder="请输入产线编号"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-      <el-form-item label="产线名称" prop="productlineName">
+      <el-form-item label="产线名称" prop="productLineName">
         <el-input
-          v-model="queryParams.productlineName"
+          v-model="queryParams.productLineName"
           placeholder="请输入产线名称"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="产线类别" prop="productlineType">
-        <el-select v-model="queryParams.productlineType" placeholder="请选择产线类别" clearable>
+      <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"
@@ -27,14 +19,6 @@
           />
         </el-select>
       </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>
@@ -49,7 +33,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['base:productline:add']"
+          v-hasPermi="['base:productLine:add']"
         >新增</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -60,7 +44,7 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['base:productline:edit']"
+          v-hasPermi="['base:productLine:edit']"
         >修改</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -71,7 +55,7 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['base:productline:remove']"
+          v-hasPermi="['base:productLine:remove']"
         >删除</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -81,20 +65,20 @@
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
-          v-hasPermi="['base:productline:export']"
+          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="productlineList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :data="productLineList" @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">
+      <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"/>
+          <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"/>
@@ -122,14 +106,14 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['base:productline:edit']"
+            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']"
+            v-hasPermi="['base:productLine:remove']"
           >删除</el-button>
         </template>
       </el-table-column>
@@ -146,14 +130,14 @@
     <!-- 添加或修改产线信息对话框 -->
     <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 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 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-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"
@@ -191,11 +175,11 @@
 </template>
 
 <script>
-import { listProductline, getProductline, delProductline, addProductline, updateProductline } from "@/api/base/productline";
+import { listProductLine, getProductLine, delProductLine, addProductLine, updateProductLine } from "@/api/base/productLine";
 import { findFactoryList } from "@/api/base/factory";
 
 export default {
-  name: "Productline",
+  name: "ProductLine",
   dicts: ['line_type', 'is_flag'],
   data() {
     return {
@@ -212,7 +196,7 @@ export default {
       // 总条数
       total: 0,
       // 产线信息表格数据
-      productlineList: [],
+      productLineList: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -221,9 +205,9 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        productlineCode: null,
-        productlineName: null,
-        productlineType: null,
+        productLineCode: null,
+        productLineName: null,
+        productLineType: null,
         plantCode: null,
         isFlag: null,
         createdBy: null,
@@ -254,13 +238,16 @@ export default {
   },
   created() {
     this.getList();
+    findFactoryList().then(response => {
+      this.factoryList = response.data;
+    });
   },
   methods: {
     /** 查询产线信息列表 */
     getList() {
       this.loading = true;
-      listProductline(this.queryParams).then(response => {
-        this.productlineList = response.rows;
+      listProductLine(this.queryParams).then(response => {
+        this.productLineList = response.rows;
         this.total = response.total;
         this.loading = false;
       });
@@ -273,10 +260,10 @@ export default {
     // 表单重置
     reset() {
       this.form = {
-        objid: null,
-        productlineCode: null,
-        productlineName: null,
-        productlineType: null,
+        objId: null,
+        productLineCode: null,
+        productLineName: null,
+        productLineType: null,
         plantCode: null,
         isFlag: 0,
         createdBy: null,
@@ -298,24 +285,21 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.objid)
+      this.ids = selection.map(item => item.objId)
       this.single = selection.length!==1
       this.multiple = !selection.length
     },
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
-      findFactoryList().then(response => {
-        this.factoryList = response.data;
-      });
       this.open = true;
       this.title = "添加产线信息";
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      const objid = row.objid || this.ids
-      getProductline(objid).then(response => {
+      const objId = row.objId || this.ids
+      getProductLine(objId).then(response => {
         this.form = response.data;
         this.open = true;
         this.title = "修改产线信息";
@@ -325,14 +309,14 @@ export default {
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
-          if (this.form.objid != null) {
-            updateProductline(this.form).then(response => {
+          if (this.form.objId != null) {
+            updateProductLine(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
-            addProductline(this.form).then(response => {
+            addProductLine(this.form).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -343,9 +327,9 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const objids = row.objid || this.ids;
-      this.$modal.confirm('是否确认删除产线信息编号为"' + objids + '"的数据项？').then(function() {
-        return delProductline(objids);
+      const objIds = row.objId || this.ids;
+      this.$modal.confirm('是否确认删除产线信息编号为"' + objIds + '"的数据项？').then(function() {
+        return delProductLine(objIds);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");
@@ -353,9 +337,9 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('base/productline/export', {
+      this.download('base/productLine/export', {
         ...this.queryParams
-      }, `productline_${new Date().getTime()}.xlsx`)
+      }, `productLine_${new Date().getTime()}.xlsx`)
     }
   }
 };