diff --git a/src/views/basics/flatWarehouse/materialInfo/index.vue b/src/views/basics/flatWarehouse/materialInfo/index.vue
index d65d950..cab9a7f 100644
--- a/src/views/basics/flatWarehouse/materialInfo/index.vue
+++ b/src/views/basics/flatWarehouse/materialInfo/index.vue
@@ -21,8 +21,14 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="物料名称" prop="MATERIALSPECNAME">
-              <el-Input v-model="state.queryParams.params.DESC_CN" placeholder="物料名称" v-on:keyup.enter="queryInfo" />
+            <el-form-item label="品名" prop="DESC_CN">
+              <el-Input v-model="state.queryParams.params.DESC_CN" placeholder="品名" v-on:keyup.enter="queryInfo" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="物料类型" prop="MATERIALTYPE">
+              <el-Input v-model="state.queryParams.params.MATERIALTYPE" placeholder="物料类型"
+                v-on:keyup.enter="queryInfo" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -60,19 +66,20 @@
         </div>
       </div>
       <el-table
-              border
-              v-loading="materialTableConfig.loading"
-              :data="state.MaterialList"
-              highlight-current-row
-              :height="tableHeight"
-              row-key="id"
-              :table-layout="'auto'">
+        border
+        v-loading="materialTableConfig.loading"
+        :data="state.MaterialList"
+        highlight-current-row
+        :height="200"
+        row-key="id"
+        @row-click="selectRow">
         <template v-for="(col, index) in materialTableConfig.column" :key="index">
           <el-table-column
-                  v-if="!col.hide"
-                  :label="col.header"
-                  :prop="col.field"
-                  align="center">
+            v-if="!col.hide"
+            :label="col.header"
+            :prop="col.field"
+            align="center"
+            show-overflow-tooltip>
           <template #default="scope">
             <span>{{ scope.row[col.field] }}</span>
             <!-- 或者直接使用 {{ scope.row[col.prop] }} 如果 col.prop 存在且您想用它 -->
@@ -83,6 +90,38 @@
       <pagination v-if="state.total > 0" :total="state.total" v-model:pageNumTo="state.queryParams.pageNum"
         v-model:pageSizeTo="state.queryParams.pageSize" @pagination="handleQuery" />
     </div>
+    <div class="vue-element-page-table">
+      <div class="page-table-operate">
+        <div class="page-table-title">
+          <div class="page-table-title-left">
+            <span>工厂信息列表</span>
+          </div>
+        </div>
+      </div>
+      <el-table
+        border
+        v-loading="state.materialFactoryLoading"
+        :data="state.materialFactoryList"
+        highlight-current-row
+        :height="200"
+        row-key="id">
+        <template v-for="(col, index) in state.materialFactoryColumn" :key="index">
+          <el-table-column
+            v-if="!col.hide"
+            :label="col.header"
+            :prop="col.field"
+            align="center"
+            show-overflow-tooltip>
+          <template #default="scope">
+            <span>{{ scope.row[col.field] }}</span>
+            <!-- 或者直接使用 {{ scope.row[col.prop] }} 如果 col.prop 存在且您想用它 -->
+          </template>
+          </el-table-column>
+        </template>
+      </el-table>
+      <pagination v-if="state.materialFactoryTotal > 0" :total="state.materialFactoryTotal" v-model:pageNumTo="state.materialFactoryQueryParams.pageNum"
+        v-model:pageSizeTo="state.materialFactoryQueryParams.pageSize" @pagination="handleQueryMaterialFactory" />
+    </div>
   </div>
 </template>
 <script lang="ts">
@@ -127,6 +166,19 @@ const formDataRefData = ref({
 /***---------------------------------------------------------------------------
  * -------------------------------------页面SQL语句配置------------------------------------------ */
 const state = reactive({
+  materialFactoryList: [],
+  materialFactoryLoading: false,
+  materialFactoryColumn: [] as any,
+  materialFactoryTotal: 0,
+  materialFactoryQueryParams: {
+    queryId: 'GetMaterialFactoryList',
+    version: '10001',
+    params: {
+      MATERIALSPECNAME: ''
+    },
+    pageNum: 1,
+    pageSize: 10
+  },
   loadings : false,
   disableds : false,
   rsa: '',
@@ -139,6 +191,7 @@ const state = reactive({
       SITENAME: 'SDK',
       DESC_CN: '',
       IS_CON_TEMP: '',
+      MATERIALTYPE: '',
     },
     pageNum: 1,
     pageSize: 20
@@ -217,18 +270,37 @@ onMounted(() => {
     { header: "物料编号", field: "MATERIALSPECNAME", hide: false  },
     { header: "品名", field: "DESC_CN", hide: false },
     { header: "规格型号", field: "DESCRIPTION", hide: false },
-    { header: "物料类型", field: "MATERIALTYPE", hide: false },
-    { header: "恒温管控", field: "IS_CON_TEMP", hide: false },
-    { header: "是否熟化", field: "MATURATIONFLAG", hide: false },
-    { header: "烘烤天数", field: "MATURATIONTIME", hide: false },
+    { header: "阶段", field: "PHASE", hide: false },
     { header: "主单位", field: "MATERIALUNIT", hide: false },
+    { header: "主单位描述", field: "MATERIALUNITDESC", hide: false },
+    { header: "物料类型", field: "MATERIALTYPE", hide: false },
+    { header: "物料组", field: "MATERIALGROUP", hide: false },
+    { header: "物料组描述", field: "MATERIALGROUPDESCRIPTION", hide: false },
+    { header: "贮存条件", field: "IS_CON_TEMP", hide: false },
+    { header: "熟化条件", field: "MATURATIONFLAG", hide: false },
+    { header: "熟化天数", field: "MATURATIONTIME", hide: false },
+    { header: "保质期", field: "EXPIRATIONDAY", hide: false },
     { header: "辅单位", field: "FUNIT", hide: false },
     { header: "换算率", field: "UNIT_RATES", hide: false },
     { header: "有效期规则", field: "REPLACED_VALUE", hide: false },
-    { header: "启用批次", field: "IS_BATCH", hide: false  },
+    { header: "是否启用批次", field: "IS_BATCH", hide: false  },
+    { header: "NC料号", field: "OLDMATERIALSPECNAME", hide: false  },
+    { header: "采购分类", field: "PURCHASETYPE", hide: false  },
+    { header: "销售分类", field: "FINANCIALTYPE", hide: false  },
+    { header: "最小装载量", field: "MINORDERQTY", hide: false  },
     { header: "质检", field: "IQCFLAG", hide: false },
     { header: "检验周期", field: "INSPECTION_CYCLE", hide: false }
   ]
+  state.materialFactoryColumn = [
+    { header: "组织", field: "ERPFACTORY", hide: false  },
+    { header: "组织名称", field: "ERPFACTORYDEC", hide: false  },
+    { header: "采购组", field: "PURCHASEGROUPCODE", hide: false  },
+    { header: "采购收货地", field: "MATERIALSPECNAME", hide: false  },
+    { header: "是否质检", field: "IQCFLAG", hide: false  },
+    { header: "保质期", field: "MHDHB", hide: false  },
+    { header: "检验周期", field: "MATERIALSPECNAME", hide: false  },
+    { header: "安全库存", field: "SAFESTOCKQTY", hide: false  },
+  ]
   // 初始化时调用 handleQuery
   handleQuery();
   updateTableHeight();
@@ -253,6 +325,8 @@ const handleQuery = () => {
         state.total = res.data.total;
         state.loadings = false;
         state.disableds = false;
+        state.materialFactoryQueryParams.params.MATERIALSPECNAME = res.data.list[0].MATERIALSPECNAME
+        handleQueryMaterialFactory()
       } else {
         ElMessageBox.alert('查无此数据', '提醒框', {
           confirmButtonText: 'OK',
@@ -264,6 +338,15 @@ const handleQuery = () => {
     .catch(() => { });
 }
 
+function handleQueryMaterialFactory(){
+  state.materialFactoryLoading = true
+  state.materialFactoryList = []
+  getQueryPageList(state.materialFactoryQueryParams).then((res: any) => {
+    state.materialFactoryLoading = false
+    state.materialFactoryList = res.data.list;
+    state.materialFactoryTotal = res.data.total;
+  });
+}
 const updateList = (col: any) => {
   materialTableConfig.value.column = col
 }
@@ -287,6 +370,11 @@ const saveInfo = () => {
 const exiteInfo = () => {
   formDataRef.value.resetFields()
 }
+
+function selectRow(row: any) {
+  state.materialFactoryQueryParams.params.MATERIALSPECNAME = row.MATERIALSPECNAME
+  handleQueryMaterialFactory()
+}
 </script>
 
 <style scoped>