diff --git a/src/views/base/materialInfo/index.vue b/src/views/base/materialInfo/index.vue
index 2f5e47f..6f0d774 100644
--- a/src/views/base/materialInfo/index.vue
+++ b/src/views/base/materialInfo/index.vue
@@ -47,7 +47,22 @@
           />
         </el-select>
       </el-form-item>
-
+      <el-form-item label="商品编码" prop="productCode">
+        <el-input
+          v-model="queryParams.productCode"
+          placeholder="请输入商品编码"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="商品名称" prop="productName">
+        <el-input
+          v-model="queryParams.productName"
+          placeholder="请输入商品名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
 <!--      <el-form-item label="所属工厂" prop="plantCode">-->
 <!--        <el-input-->
 <!--          v-model="queryParams.plantCode"-->
@@ -146,6 +161,8 @@
           <span>{{ parseTime(scope.row.incrementDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
+      <el-table-column label="商品编码" align="center" prop="productCode" v-if="columns[17].visible"/>
+      <el-table-column label="商品名称" align="center" prop="productName" v-if="columns[18].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"/>
@@ -193,15 +210,21 @@
 
     <!-- 添加或修改物料信息对话框 -->
     <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 ref="form" :model="form" :rules="rules" label-width="100px">
         <el-form-item label="物料编码" prop="materialCode">
-          <el-input v-model="form.materialCode" placeholder="请输入物料编码" />
+          <el-input v-model="form.materialCode" placeholder="请输入物料编码" :disabled="infoDisabled"/>
         </el-form-item>
         <el-form-item label="物料名称" prop="materialName">
-          <el-input v-model="form.materialName" placeholder="请输入物料名称" />
+          <el-input v-model="form.materialName" placeholder="请输入物料名称" :disabled="infoDisabled"/>
+        </el-form-item>
+        <el-form-item label="商品编码" prop="productCode">
+          <el-input v-model="form.productCode" placeholder="请输入商品编码" />
+        </el-form-item>
+        <el-form-item label="商品名称" prop="productName">
+          <el-input v-model="form.productName" placeholder="请输入商品名称" />
         </el-form-item>
         <el-form-item label="物料大类" prop="materialCategories">
-          <el-select v-model="form.materialCategories" placeholder="请选择物料大类">
+          <el-select v-model="form.materialCategories" placeholder="请选择物料大类" :disabled="infoDisabled">
             <el-option
               v-for="dict in dict.type.material_categories"
               :key="dict.value"
@@ -211,7 +234,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="物料小类" prop="materialSubclass">
-          <el-select v-model="form.materialSubclass" placeholder="请选择物料小类">
+          <el-select v-model="form.materialSubclass" placeholder="请选择物料小类" :disabled="infoDisabled">
             <el-option
               v-for="dict in dict.type.material_subclass"
               :key="dict.value"
@@ -221,7 +244,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="SAP物料类型" prop="materialType">
-          <el-select v-model="form.materialType" placeholder="请选择SAP物料类型">
+          <el-select v-model="form.materialType" placeholder="请选择SAP物料类型" :disabled="infoDisabled">
             <el-option
               v-for="dict in dict.type.material_type"
               :key="dict.value"
@@ -237,10 +260,10 @@
           <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-input v-model="form.materialSpecifications" placeholder="请输入物料规格" :disabled="infoDisabled"/>
         </el-form-item>
         <el-form-item label="所属工厂">
-          <el-select v-model="form.plantCode" placeholder="请选择所属工厂">
+          <el-select v-model="form.plantCode" placeholder="请选择所属工厂" :disabled="infoDisabled">
             <el-option
               v-for="item in factoryList"
               :key="item.factoryCode"
@@ -305,6 +328,8 @@ export default {
       multiple: true,
       // 显示搜索条件
       showSearch: true,
+      // 限制输入
+      infoDisabled: true,
       // 总条数
       total: 0,
       // 物料信息表格数据
@@ -357,6 +382,8 @@ export default {
         { key: 14, label: `更新人`, visible: false },
         { key: 15, label: `更新时间`, visible: false },
         { key: 16, label: `增量日期`, visible: true },
+        { key: 17, label: `商品编码`, visible: true },
+        { key: 18, label: `商品名称`, visible: true },
       ],
       // 工厂选项
       factoryList: [],
@@ -410,6 +437,7 @@ export default {
         updatedTime: null
       };
       this.resetForm("form");
+      this.infoDisabled = false;
     },
     /** 搜索按钮操作 */
     handleQuery() {
@@ -439,6 +467,7 @@ export default {
       const objId = row.objId || this.ids
       getMaterialInfo(objId).then(response => {
         this.form = response.data;
+        this.infoDisabled = true;
         this.open = true;
         this.title = "修改物料信息";
       });