diff --git a/src/api/supplier/supplier.js b/src/api/supplier/supplier.js
index 593b7cd..b095e09 100644
--- a/src/api/supplier/supplier.js
+++ b/src/api/supplier/supplier.js
@@ -14,8 +14,8 @@
   return instance.post(`/supplierPreReview/listPage?${str}`, data)
 }
 // 历史预审不分页列表
-const historyInquiry = () => {
-  return instance.post(`/supplierPreReview/history`, {})
+const historyInquiry = (data) => {
+  return instance.post(`/supplierPreReview/history`, data)
 }
 
 // 新增

diff --git a/src/api/supplier/supplier.js b/src/api/supplier/supplier.js
index 593b7cd..b095e09 100644
--- a/src/api/supplier/supplier.js
+++ b/src/api/supplier/supplier.js
@@ -14,8 +14,8 @@
   return instance.post(`/supplierPreReview/listPage?${str}`, data)
 }
 // 历史预审不分页列表
-const historyInquiry = () => {
-  return instance.post(`/supplierPreReview/history`, {})
+const historyInquiry = (data) => {
+  return instance.post(`/supplierPreReview/history`, data)
 }
 
 // 新增
diff --git a/src/components/mycomponent/dialog/historyInquiryDialog.vue b/src/components/mycomponent/dialog/historyInquiryDialog.vue
deleted file mode 100644
index af79f76..0000000
--- a/src/components/mycomponent/dialog/historyInquiryDialog.vue
+++ /dev/null
@@ -1,150 +0,0 @@
-<!--历史预审弹窗-->
-<template>
-  <el-dialog title="历史预审" width="975px" :visible.sync="isShowInfo" append-to-body @close="close">
-    <div class="historyInquiryDialog">
-      <div class="Dialog-input">
-        <div class="inputContent">
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="dataInfo.supplierCode"
-              title="供应商编号"
-              disabled
-              placeholder="请输入编号"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="dataInfo.supplierStatusName"
-              title="供应商状态"
-              disabled
-              placeholder="请输入状态"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-        </div>
-        <div class="inputContent">
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="dataInfo.supplierName"
-              title="供应商名称"
-              disabled
-              placeholder="请输入供应商名称"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-        </div>
-      </div>
-      <div class="Dialog-table">
-        <el-table :data="tableData" height="250" border style="width: 100%" :header-cell-style="headerStyle">
-          <el-table-column type="index" :index="indexMethod" label="序号" width="100" />
-          <el-table-column prop="preReviewResultName" label="资料预审结果" width="150" />
-          <el-table-column prop="preReviewIllustration" label="资料预审说明" width="150" />
-          <el-table-column prop="preReviewDate" label="资料预审日期" width="150" />
-          <el-table-column prop="preReviewFile" label="预审详情" />
-          <el-table-column label="预审详情">
-            <template slot-scope="scope">
-              <el-button type="text" size="small">
-                预览
-              </el-button>
-              <el-button type="text" size="small">
-                下载
-              </el-button>
-            </template>
-          </el-table-column>
-        </el-table>
-      </div>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import dialogHeader from './dialogHeader.vue'
-import inputVue from '../input/inputVue.vue'
-import RedStar from '../redStar.vue'
-
-import { historyInquiry } from '../../../api/supplier/supplier'
-
-export default {
-  components: { inputVue, dialogHeader, RedStar },
-  props: {
-    dataInfo: {
-      type: Object,
-      dataInfo: {}
-    }
-  },
-  data() {
-    return {
-      isShowInfo: true,
-      tableData: []
-    }
-  },
-  mounted() {
-    console.log(this.dataInfo)
-    this.getHistoryInquiry()
-  },
-  methods: {
-    // 生成序号
-    indexMethod(index) {
-      return index + 1
-    },
-    // 合并表头
-    headerStyle({ row, column, rowIndex, columnIndex }) {
-      row[4].colSpan = 2 // 第三列的表头占据3个单元格
-      row[5].colSpan = 0
-      if (columnIndex === 5) {
-        return 'display: none'
-      }
-    },
-    close() {
-      this.$emit('close')
-    },
-    // 历史预审列表
-    getHistoryInquiry() {
-      historyInquiry({}).then(res => {
-        console.log(res)
-        this.tableData = res
-      })
-    }
-  }
-}
-</script>
-
-<style lang='scss' scoped>
-.historyInquiryDialog {
-  width: 60%;
-  padding: 0 20px;
-  box-sizing: border-box;
-
-  .Dialog-input {
-    padding: 10px 20px;
-    display: flex;
-
-    .inputContent {
-      margin-right: 30px;
-      display: flex;
-      flex: 1;
-      flex-direction: column;
-
-      .inputBox {
-        display: flex;
-        justify-content: inherit;
-        align-items: center;
-      }
-    }
-
-  }
-
-  .Dialog-table {
-    width: 850px;
-    margin: 20px;
-  }
-
-}
-</style>

diff --git a/src/api/supplier/supplier.js b/src/api/supplier/supplier.js
index 593b7cd..b095e09 100644
--- a/src/api/supplier/supplier.js
+++ b/src/api/supplier/supplier.js
@@ -14,8 +14,8 @@
   return instance.post(`/supplierPreReview/listPage?${str}`, data)
 }
 // 历史预审不分页列表
-const historyInquiry = () => {
-  return instance.post(`/supplierPreReview/history`, {})
+const historyInquiry = (data) => {
+  return instance.post(`/supplierPreReview/history`, data)
 }
 
 // 新增
diff --git a/src/components/mycomponent/dialog/historyInquiryDialog.vue b/src/components/mycomponent/dialog/historyInquiryDialog.vue
deleted file mode 100644
index af79f76..0000000
--- a/src/components/mycomponent/dialog/historyInquiryDialog.vue
+++ /dev/null
@@ -1,150 +0,0 @@
-<!--历史预审弹窗-->
-<template>
-  <el-dialog title="历史预审" width="975px" :visible.sync="isShowInfo" append-to-body @close="close">
-    <div class="historyInquiryDialog">
-      <div class="Dialog-input">
-        <div class="inputContent">
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="dataInfo.supplierCode"
-              title="供应商编号"
-              disabled
-              placeholder="请输入编号"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="dataInfo.supplierStatusName"
-              title="供应商状态"
-              disabled
-              placeholder="请输入状态"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-        </div>
-        <div class="inputContent">
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="dataInfo.supplierName"
-              title="供应商名称"
-              disabled
-              placeholder="请输入供应商名称"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-        </div>
-      </div>
-      <div class="Dialog-table">
-        <el-table :data="tableData" height="250" border style="width: 100%" :header-cell-style="headerStyle">
-          <el-table-column type="index" :index="indexMethod" label="序号" width="100" />
-          <el-table-column prop="preReviewResultName" label="资料预审结果" width="150" />
-          <el-table-column prop="preReviewIllustration" label="资料预审说明" width="150" />
-          <el-table-column prop="preReviewDate" label="资料预审日期" width="150" />
-          <el-table-column prop="preReviewFile" label="预审详情" />
-          <el-table-column label="预审详情">
-            <template slot-scope="scope">
-              <el-button type="text" size="small">
-                预览
-              </el-button>
-              <el-button type="text" size="small">
-                下载
-              </el-button>
-            </template>
-          </el-table-column>
-        </el-table>
-      </div>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import dialogHeader from './dialogHeader.vue'
-import inputVue from '../input/inputVue.vue'
-import RedStar from '../redStar.vue'
-
-import { historyInquiry } from '../../../api/supplier/supplier'
-
-export default {
-  components: { inputVue, dialogHeader, RedStar },
-  props: {
-    dataInfo: {
-      type: Object,
-      dataInfo: {}
-    }
-  },
-  data() {
-    return {
-      isShowInfo: true,
-      tableData: []
-    }
-  },
-  mounted() {
-    console.log(this.dataInfo)
-    this.getHistoryInquiry()
-  },
-  methods: {
-    // 生成序号
-    indexMethod(index) {
-      return index + 1
-    },
-    // 合并表头
-    headerStyle({ row, column, rowIndex, columnIndex }) {
-      row[4].colSpan = 2 // 第三列的表头占据3个单元格
-      row[5].colSpan = 0
-      if (columnIndex === 5) {
-        return 'display: none'
-      }
-    },
-    close() {
-      this.$emit('close')
-    },
-    // 历史预审列表
-    getHistoryInquiry() {
-      historyInquiry({}).then(res => {
-        console.log(res)
-        this.tableData = res
-      })
-    }
-  }
-}
-</script>
-
-<style lang='scss' scoped>
-.historyInquiryDialog {
-  width: 60%;
-  padding: 0 20px;
-  box-sizing: border-box;
-
-  .Dialog-input {
-    padding: 10px 20px;
-    display: flex;
-
-    .inputContent {
-      margin-right: 30px;
-      display: flex;
-      flex: 1;
-      flex-direction: column;
-
-      .inputBox {
-        display: flex;
-        justify-content: inherit;
-        align-items: center;
-      }
-    }
-
-  }
-
-  .Dialog-table {
-    width: 850px;
-    margin: 20px;
-  }
-
-}
-</style>
diff --git a/src/views/supplier/historyInquiryDialog.vue b/src/views/supplier/historyInquiryDialog.vue
new file mode 100644
index 0000000..18a4f11
--- /dev/null
+++ b/src/views/supplier/historyInquiryDialog.vue
@@ -0,0 +1,77 @@
+<!--历史预审弹窗-->
+<template>
+  <el-dialog title="历史预审" width="60%" :visible.sync="isShowInfo" append-to-body :close-on-click-modal="false">
+    <el-descriptions class="margin-top" title="" :column="2" border style="width: 100%">
+      <el-descriptions-item label="供应商名称" :label-style="labelStyle" :content-style="contentStyle">{{ dataInfo.supplierName }}</el-descriptions-item>
+      <el-descriptions-item label="供应商编号" :label-style="labelStyle">{{ dataInfo.supplierCode }}</el-descriptions-item>
+      <el-descriptions-item label="供应商状态">{{ dataInfo.supplierStatusName }}</el-descriptions-item>
+    </el-descriptions>
+
+    <div style="margin-top: 30px; font-size: 1rem">预审记录</div>
+    <el-table :data="tableData" style="width: 100%" max-height="400px" :highlight-current-row="true">
+      <el-table-column label="序号" width="75">
+        <template scope="scope">
+          <span>{{ scope.$index + 1 }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="preReviewResultName" label="预审结果" width="150" ></el-table-column>
+      <el-table-column prop="preReviewIllustration" label="预审结果说明"></el-table-column>
+      <el-table-column prop="preReviewDate" label="预审日期" width="150" />
+      <el-table-column label="预审附件" width="300">
+        <template slot-scope="scope">
+          <el-link v-for="(item, index) in scope.row.preReviewFileList" :href="baseUrl + item" :disabled="item === ''" type="primary" target="_blank" style="margin-right: 10px;">附件{{ index + 1 }}</el-link>
+        </template>
+      </el-table-column>
+    </el-table>
+  </el-dialog>
+</template>
+
+<script>
+import { historyInquiry } from '@/api/supplier/supplier'
+
+export default {
+  name: 'HistoryInquiryDialog',
+  data() {
+    return {
+      isShowInfo: false,
+      tableData: [],
+      dataInfo: {
+
+      },
+      baseUrl: '',
+      labelStyle: {
+        width: '20%'
+      },
+      contentStyle: {
+        width: '30%'
+      }
+    }
+  },
+  methods: {
+    initHistoryDialog(row) {
+      this.dataInfo = row
+      this.getHistoryInquiry(row.supplierCode)
+      this.isShowInfo = true
+      this.baseUrl = this.baseConfig.baseUrl + '/static/'
+    },
+    // 历史预审列表
+    getHistoryInquiry(supplierCode) {
+      historyInquiry({ supplierCode: supplierCode }).then(res => {
+        res.forEach(record => {
+          if (record.preReviewDate !== '' && record.preReviewDate.length > 10) {
+            record.preReviewDate = record.preReviewDate.substring(0, 10)
+          }
+          if (record.preReviewFile !== '') {
+            record.preReviewFileList = record.preReviewFile.split(',')
+          }
+        })
+        this.tableData = res
+      })
+    }
+  }
+}
+</script>
+
+<style lang='scss' scoped>
+
+</style>

diff --git a/src/api/supplier/supplier.js b/src/api/supplier/supplier.js
index 593b7cd..b095e09 100644
--- a/src/api/supplier/supplier.js
+++ b/src/api/supplier/supplier.js
@@ -14,8 +14,8 @@
   return instance.post(`/supplierPreReview/listPage?${str}`, data)
 }
 // 历史预审不分页列表
-const historyInquiry = () => {
-  return instance.post(`/supplierPreReview/history`, {})
+const historyInquiry = (data) => {
+  return instance.post(`/supplierPreReview/history`, data)
 }
 
 // 新增
diff --git a/src/components/mycomponent/dialog/historyInquiryDialog.vue b/src/components/mycomponent/dialog/historyInquiryDialog.vue
deleted file mode 100644
index af79f76..0000000
--- a/src/components/mycomponent/dialog/historyInquiryDialog.vue
+++ /dev/null
@@ -1,150 +0,0 @@
-<!--历史预审弹窗-->
-<template>
-  <el-dialog title="历史预审" width="975px" :visible.sync="isShowInfo" append-to-body @close="close">
-    <div class="historyInquiryDialog">
-      <div class="Dialog-input">
-        <div class="inputContent">
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="dataInfo.supplierCode"
-              title="供应商编号"
-              disabled
-              placeholder="请输入编号"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="dataInfo.supplierStatusName"
-              title="供应商状态"
-              disabled
-              placeholder="请输入状态"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-        </div>
-        <div class="inputContent">
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="dataInfo.supplierName"
-              title="供应商名称"
-              disabled
-              placeholder="请输入供应商名称"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-        </div>
-      </div>
-      <div class="Dialog-table">
-        <el-table :data="tableData" height="250" border style="width: 100%" :header-cell-style="headerStyle">
-          <el-table-column type="index" :index="indexMethod" label="序号" width="100" />
-          <el-table-column prop="preReviewResultName" label="资料预审结果" width="150" />
-          <el-table-column prop="preReviewIllustration" label="资料预审说明" width="150" />
-          <el-table-column prop="preReviewDate" label="资料预审日期" width="150" />
-          <el-table-column prop="preReviewFile" label="预审详情" />
-          <el-table-column label="预审详情">
-            <template slot-scope="scope">
-              <el-button type="text" size="small">
-                预览
-              </el-button>
-              <el-button type="text" size="small">
-                下载
-              </el-button>
-            </template>
-          </el-table-column>
-        </el-table>
-      </div>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import dialogHeader from './dialogHeader.vue'
-import inputVue from '../input/inputVue.vue'
-import RedStar from '../redStar.vue'
-
-import { historyInquiry } from '../../../api/supplier/supplier'
-
-export default {
-  components: { inputVue, dialogHeader, RedStar },
-  props: {
-    dataInfo: {
-      type: Object,
-      dataInfo: {}
-    }
-  },
-  data() {
-    return {
-      isShowInfo: true,
-      tableData: []
-    }
-  },
-  mounted() {
-    console.log(this.dataInfo)
-    this.getHistoryInquiry()
-  },
-  methods: {
-    // 生成序号
-    indexMethod(index) {
-      return index + 1
-    },
-    // 合并表头
-    headerStyle({ row, column, rowIndex, columnIndex }) {
-      row[4].colSpan = 2 // 第三列的表头占据3个单元格
-      row[5].colSpan = 0
-      if (columnIndex === 5) {
-        return 'display: none'
-      }
-    },
-    close() {
-      this.$emit('close')
-    },
-    // 历史预审列表
-    getHistoryInquiry() {
-      historyInquiry({}).then(res => {
-        console.log(res)
-        this.tableData = res
-      })
-    }
-  }
-}
-</script>
-
-<style lang='scss' scoped>
-.historyInquiryDialog {
-  width: 60%;
-  padding: 0 20px;
-  box-sizing: border-box;
-
-  .Dialog-input {
-    padding: 10px 20px;
-    display: flex;
-
-    .inputContent {
-      margin-right: 30px;
-      display: flex;
-      flex: 1;
-      flex-direction: column;
-
-      .inputBox {
-        display: flex;
-        justify-content: inherit;
-        align-items: center;
-      }
-    }
-
-  }
-
-  .Dialog-table {
-    width: 850px;
-    margin: 20px;
-  }
-
-}
-</style>
diff --git a/src/views/supplier/historyInquiryDialog.vue b/src/views/supplier/historyInquiryDialog.vue
new file mode 100644
index 0000000..18a4f11
--- /dev/null
+++ b/src/views/supplier/historyInquiryDialog.vue
@@ -0,0 +1,77 @@
+<!--历史预审弹窗-->
+<template>
+  <el-dialog title="历史预审" width="60%" :visible.sync="isShowInfo" append-to-body :close-on-click-modal="false">
+    <el-descriptions class="margin-top" title="" :column="2" border style="width: 100%">
+      <el-descriptions-item label="供应商名称" :label-style="labelStyle" :content-style="contentStyle">{{ dataInfo.supplierName }}</el-descriptions-item>
+      <el-descriptions-item label="供应商编号" :label-style="labelStyle">{{ dataInfo.supplierCode }}</el-descriptions-item>
+      <el-descriptions-item label="供应商状态">{{ dataInfo.supplierStatusName }}</el-descriptions-item>
+    </el-descriptions>
+
+    <div style="margin-top: 30px; font-size: 1rem">预审记录</div>
+    <el-table :data="tableData" style="width: 100%" max-height="400px" :highlight-current-row="true">
+      <el-table-column label="序号" width="75">
+        <template scope="scope">
+          <span>{{ scope.$index + 1 }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="preReviewResultName" label="预审结果" width="150" ></el-table-column>
+      <el-table-column prop="preReviewIllustration" label="预审结果说明"></el-table-column>
+      <el-table-column prop="preReviewDate" label="预审日期" width="150" />
+      <el-table-column label="预审附件" width="300">
+        <template slot-scope="scope">
+          <el-link v-for="(item, index) in scope.row.preReviewFileList" :href="baseUrl + item" :disabled="item === ''" type="primary" target="_blank" style="margin-right: 10px;">附件{{ index + 1 }}</el-link>
+        </template>
+      </el-table-column>
+    </el-table>
+  </el-dialog>
+</template>
+
+<script>
+import { historyInquiry } from '@/api/supplier/supplier'
+
+export default {
+  name: 'HistoryInquiryDialog',
+  data() {
+    return {
+      isShowInfo: false,
+      tableData: [],
+      dataInfo: {
+
+      },
+      baseUrl: '',
+      labelStyle: {
+        width: '20%'
+      },
+      contentStyle: {
+        width: '30%'
+      }
+    }
+  },
+  methods: {
+    initHistoryDialog(row) {
+      this.dataInfo = row
+      this.getHistoryInquiry(row.supplierCode)
+      this.isShowInfo = true
+      this.baseUrl = this.baseConfig.baseUrl + '/static/'
+    },
+    // 历史预审列表
+    getHistoryInquiry(supplierCode) {
+      historyInquiry({ supplierCode: supplierCode }).then(res => {
+        res.forEach(record => {
+          if (record.preReviewDate !== '' && record.preReviewDate.length > 10) {
+            record.preReviewDate = record.preReviewDate.substring(0, 10)
+          }
+          if (record.preReviewFile !== '') {
+            record.preReviewFileList = record.preReviewFile.split(',')
+          }
+        })
+        this.tableData = res
+      })
+    }
+  }
+}
+</script>
+
+<style lang='scss' scoped>
+
+</style>
diff --git a/src/views/supplier/inquiry.vue b/src/views/supplier/inquiry.vue
index e0ecf7b..99eb582 100644
--- a/src/views/supplier/inquiry.vue
+++ b/src/views/supplier/inquiry.vue
@@ -35,18 +35,18 @@
         style="width: 100%"
       >
         <el-table-column type="index" label="序号" width="100" />
-        <el-table-column prop="supplierCode" label="供应商编号" width="200" />
+        <el-table-column prop="supplierCode" label="供应商编号" width="180" />
         <el-table-column prop="supplierName" label="供应商名称" width="400" />
-        <el-table-column prop="supplierStatusName" label="供应商状态" />
-        <el-table-column prop="preReviewResultName" label="资料预审结果" />
+        <el-table-column prop="supplierStatusName" label="供应商状态" width="100" />
+        <el-table-column prop="preReviewResultName" label="资料预审结果" width="120" />
         <el-table-column prop="preReviewIllustration" label="资料预审说明" />
-        <el-table-column prop="preReviewDate" label="预审资料日期" />
-        <el-table-column header-align="center" align="center" width="200" fixed="right" label="操作">
+        <el-table-column prop="preReviewDate" label="预审资料日期" width="120"/>
+        <el-table-column header-align="center" align="center" width="150" fixed="right" label="操作">
           <template slot-scope="scope">
             <el-button type="text" size="small" @click="hitstoryDialog(scope.row)">
               历史预审
             </el-button>
-            <el-button type="text" size="small" @click="inquiryDialogClick(scope.row)">
+            <el-button :disabled="scope.row.preReviewResult == '1'" type="text" size="small" @click="inquiryDialogClick(scope.row)">
               资料预审
             </el-button>
           </template>
@@ -62,7 +62,7 @@
         @setLimit="setLimit"
       />
     </div>
-<!--    <historyInquiryDialog v-if="isShowHistoryDialog" :data-info="dataInfo" @close="inquiryHistoryDialogClose" />-->
+    <history-inquiry-dialog ref="inquiryHis" />
     <inquiry-dialog ref="inquiryDia" @refreshList="selectData"/>
   </div>
 </template>
@@ -70,7 +70,7 @@
 <script>
 import GroupPage from '../../components/mycomponent/groupPage.vue'
 import InquiryDialog from '@/views/supplier/inquiryDialog'
-import HistoryInquiryDialog from '@/components/mycomponent/dialog/historyInquiryDialog'
+import HistoryInquiryDialog from '@/views/supplier/historyInquiryDialog'
 
 import { i_list } from '../../api/supplier/supplier'
 import { tableRowClassName } from '../../utils/myUtils/changeTableTr'
@@ -78,7 +78,7 @@
 export default { // 加入分页逻辑
   name: 'Inquiry',
   components: {
-    InquiryDialog, GroupPage
+    InquiryDialog, HistoryInquiryDialog, GroupPage
   },
   mixins: [listMixin],
   data() {
@@ -102,25 +102,17 @@
   methods: {
     tableRowClassName: tableRowClassName,
     hitstoryDialog(row) {
-      console.log(row)
-      this.dataInfo = row
-      this.isShowHistoryDialog = true
+      this.$refs.inquiryHis.initHistoryDialog(row)
     },
     inquiryHistoryDialogClose() {
       this.isShowHistoryDialog = false
     },
-    inquiryDialogClose() {
-      this.isShowDialog = false
-    },
     inquiryDialogClick(row) {
-      // this.dataInfo = row
-      // this.isShowDialog = true
       this.$refs.inquiryDia.initDialog(row)
     },
     // 获取列表
-    getListPage(limit, offset) {
+    getListPage(limit = 10, offset = 1) {
       i_list(`limit=${limit}&offset=${offset}`, this.queryInfo).then(res => {
-        console.log(res)
         this.tableData = res
       })
     },
@@ -129,7 +121,7 @@
       this.selectInfo = { // 搜索框中的数据的数据
         supplierCode: '',
         supplierName: '',
-        preReviewResultName: ''
+        preReviewResult: ''
       }
     }
   }

diff --git a/src/api/supplier/supplier.js b/src/api/supplier/supplier.js
index 593b7cd..b095e09 100644
--- a/src/api/supplier/supplier.js
+++ b/src/api/supplier/supplier.js
@@ -14,8 +14,8 @@
   return instance.post(`/supplierPreReview/listPage?${str}`, data)
 }
 // 历史预审不分页列表
-const historyInquiry = () => {
-  return instance.post(`/supplierPreReview/history`, {})
+const historyInquiry = (data) => {
+  return instance.post(`/supplierPreReview/history`, data)
 }
 
 // 新增
diff --git a/src/components/mycomponent/dialog/historyInquiryDialog.vue b/src/components/mycomponent/dialog/historyInquiryDialog.vue
deleted file mode 100644
index af79f76..0000000
--- a/src/components/mycomponent/dialog/historyInquiryDialog.vue
+++ /dev/null
@@ -1,150 +0,0 @@
-<!--历史预审弹窗-->
-<template>
-  <el-dialog title="历史预审" width="975px" :visible.sync="isShowInfo" append-to-body @close="close">
-    <div class="historyInquiryDialog">
-      <div class="Dialog-input">
-        <div class="inputContent">
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="dataInfo.supplierCode"
-              title="供应商编号"
-              disabled
-              placeholder="请输入编号"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="dataInfo.supplierStatusName"
-              title="供应商状态"
-              disabled
-              placeholder="请输入状态"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-        </div>
-        <div class="inputContent">
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="dataInfo.supplierName"
-              title="供应商名称"
-              disabled
-              placeholder="请输入供应商名称"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-        </div>
-      </div>
-      <div class="Dialog-table">
-        <el-table :data="tableData" height="250" border style="width: 100%" :header-cell-style="headerStyle">
-          <el-table-column type="index" :index="indexMethod" label="序号" width="100" />
-          <el-table-column prop="preReviewResultName" label="资料预审结果" width="150" />
-          <el-table-column prop="preReviewIllustration" label="资料预审说明" width="150" />
-          <el-table-column prop="preReviewDate" label="资料预审日期" width="150" />
-          <el-table-column prop="preReviewFile" label="预审详情" />
-          <el-table-column label="预审详情">
-            <template slot-scope="scope">
-              <el-button type="text" size="small">
-                预览
-              </el-button>
-              <el-button type="text" size="small">
-                下载
-              </el-button>
-            </template>
-          </el-table-column>
-        </el-table>
-      </div>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import dialogHeader from './dialogHeader.vue'
-import inputVue from '../input/inputVue.vue'
-import RedStar from '../redStar.vue'
-
-import { historyInquiry } from '../../../api/supplier/supplier'
-
-export default {
-  components: { inputVue, dialogHeader, RedStar },
-  props: {
-    dataInfo: {
-      type: Object,
-      dataInfo: {}
-    }
-  },
-  data() {
-    return {
-      isShowInfo: true,
-      tableData: []
-    }
-  },
-  mounted() {
-    console.log(this.dataInfo)
-    this.getHistoryInquiry()
-  },
-  methods: {
-    // 生成序号
-    indexMethod(index) {
-      return index + 1
-    },
-    // 合并表头
-    headerStyle({ row, column, rowIndex, columnIndex }) {
-      row[4].colSpan = 2 // 第三列的表头占据3个单元格
-      row[5].colSpan = 0
-      if (columnIndex === 5) {
-        return 'display: none'
-      }
-    },
-    close() {
-      this.$emit('close')
-    },
-    // 历史预审列表
-    getHistoryInquiry() {
-      historyInquiry({}).then(res => {
-        console.log(res)
-        this.tableData = res
-      })
-    }
-  }
-}
-</script>
-
-<style lang='scss' scoped>
-.historyInquiryDialog {
-  width: 60%;
-  padding: 0 20px;
-  box-sizing: border-box;
-
-  .Dialog-input {
-    padding: 10px 20px;
-    display: flex;
-
-    .inputContent {
-      margin-right: 30px;
-      display: flex;
-      flex: 1;
-      flex-direction: column;
-
-      .inputBox {
-        display: flex;
-        justify-content: inherit;
-        align-items: center;
-      }
-    }
-
-  }
-
-  .Dialog-table {
-    width: 850px;
-    margin: 20px;
-  }
-
-}
-</style>
diff --git a/src/views/supplier/historyInquiryDialog.vue b/src/views/supplier/historyInquiryDialog.vue
new file mode 100644
index 0000000..18a4f11
--- /dev/null
+++ b/src/views/supplier/historyInquiryDialog.vue
@@ -0,0 +1,77 @@
+<!--历史预审弹窗-->
+<template>
+  <el-dialog title="历史预审" width="60%" :visible.sync="isShowInfo" append-to-body :close-on-click-modal="false">
+    <el-descriptions class="margin-top" title="" :column="2" border style="width: 100%">
+      <el-descriptions-item label="供应商名称" :label-style="labelStyle" :content-style="contentStyle">{{ dataInfo.supplierName }}</el-descriptions-item>
+      <el-descriptions-item label="供应商编号" :label-style="labelStyle">{{ dataInfo.supplierCode }}</el-descriptions-item>
+      <el-descriptions-item label="供应商状态">{{ dataInfo.supplierStatusName }}</el-descriptions-item>
+    </el-descriptions>
+
+    <div style="margin-top: 30px; font-size: 1rem">预审记录</div>
+    <el-table :data="tableData" style="width: 100%" max-height="400px" :highlight-current-row="true">
+      <el-table-column label="序号" width="75">
+        <template scope="scope">
+          <span>{{ scope.$index + 1 }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="preReviewResultName" label="预审结果" width="150" ></el-table-column>
+      <el-table-column prop="preReviewIllustration" label="预审结果说明"></el-table-column>
+      <el-table-column prop="preReviewDate" label="预审日期" width="150" />
+      <el-table-column label="预审附件" width="300">
+        <template slot-scope="scope">
+          <el-link v-for="(item, index) in scope.row.preReviewFileList" :href="baseUrl + item" :disabled="item === ''" type="primary" target="_blank" style="margin-right: 10px;">附件{{ index + 1 }}</el-link>
+        </template>
+      </el-table-column>
+    </el-table>
+  </el-dialog>
+</template>
+
+<script>
+import { historyInquiry } from '@/api/supplier/supplier'
+
+export default {
+  name: 'HistoryInquiryDialog',
+  data() {
+    return {
+      isShowInfo: false,
+      tableData: [],
+      dataInfo: {
+
+      },
+      baseUrl: '',
+      labelStyle: {
+        width: '20%'
+      },
+      contentStyle: {
+        width: '30%'
+      }
+    }
+  },
+  methods: {
+    initHistoryDialog(row) {
+      this.dataInfo = row
+      this.getHistoryInquiry(row.supplierCode)
+      this.isShowInfo = true
+      this.baseUrl = this.baseConfig.baseUrl + '/static/'
+    },
+    // 历史预审列表
+    getHistoryInquiry(supplierCode) {
+      historyInquiry({ supplierCode: supplierCode }).then(res => {
+        res.forEach(record => {
+          if (record.preReviewDate !== '' && record.preReviewDate.length > 10) {
+            record.preReviewDate = record.preReviewDate.substring(0, 10)
+          }
+          if (record.preReviewFile !== '') {
+            record.preReviewFileList = record.preReviewFile.split(',')
+          }
+        })
+        this.tableData = res
+      })
+    }
+  }
+}
+</script>
+
+<style lang='scss' scoped>
+
+</style>
diff --git a/src/views/supplier/inquiry.vue b/src/views/supplier/inquiry.vue
index e0ecf7b..99eb582 100644
--- a/src/views/supplier/inquiry.vue
+++ b/src/views/supplier/inquiry.vue
@@ -35,18 +35,18 @@
         style="width: 100%"
       >
         <el-table-column type="index" label="序号" width="100" />
-        <el-table-column prop="supplierCode" label="供应商编号" width="200" />
+        <el-table-column prop="supplierCode" label="供应商编号" width="180" />
         <el-table-column prop="supplierName" label="供应商名称" width="400" />
-        <el-table-column prop="supplierStatusName" label="供应商状态" />
-        <el-table-column prop="preReviewResultName" label="资料预审结果" />
+        <el-table-column prop="supplierStatusName" label="供应商状态" width="100" />
+        <el-table-column prop="preReviewResultName" label="资料预审结果" width="120" />
         <el-table-column prop="preReviewIllustration" label="资料预审说明" />
-        <el-table-column prop="preReviewDate" label="预审资料日期" />
-        <el-table-column header-align="center" align="center" width="200" fixed="right" label="操作">
+        <el-table-column prop="preReviewDate" label="预审资料日期" width="120"/>
+        <el-table-column header-align="center" align="center" width="150" fixed="right" label="操作">
           <template slot-scope="scope">
             <el-button type="text" size="small" @click="hitstoryDialog(scope.row)">
               历史预审
             </el-button>
-            <el-button type="text" size="small" @click="inquiryDialogClick(scope.row)">
+            <el-button :disabled="scope.row.preReviewResult == '1'" type="text" size="small" @click="inquiryDialogClick(scope.row)">
               资料预审
             </el-button>
           </template>
@@ -62,7 +62,7 @@
         @setLimit="setLimit"
       />
     </div>
-<!--    <historyInquiryDialog v-if="isShowHistoryDialog" :data-info="dataInfo" @close="inquiryHistoryDialogClose" />-->
+    <history-inquiry-dialog ref="inquiryHis" />
     <inquiry-dialog ref="inquiryDia" @refreshList="selectData"/>
   </div>
 </template>
@@ -70,7 +70,7 @@
 <script>
 import GroupPage from '../../components/mycomponent/groupPage.vue'
 import InquiryDialog from '@/views/supplier/inquiryDialog'
-import HistoryInquiryDialog from '@/components/mycomponent/dialog/historyInquiryDialog'
+import HistoryInquiryDialog from '@/views/supplier/historyInquiryDialog'
 
 import { i_list } from '../../api/supplier/supplier'
 import { tableRowClassName } from '../../utils/myUtils/changeTableTr'
@@ -78,7 +78,7 @@
 export default { // 加入分页逻辑
   name: 'Inquiry',
   components: {
-    InquiryDialog, GroupPage
+    InquiryDialog, HistoryInquiryDialog, GroupPage
   },
   mixins: [listMixin],
   data() {
@@ -102,25 +102,17 @@
   methods: {
     tableRowClassName: tableRowClassName,
     hitstoryDialog(row) {
-      console.log(row)
-      this.dataInfo = row
-      this.isShowHistoryDialog = true
+      this.$refs.inquiryHis.initHistoryDialog(row)
     },
     inquiryHistoryDialogClose() {
       this.isShowHistoryDialog = false
     },
-    inquiryDialogClose() {
-      this.isShowDialog = false
-    },
     inquiryDialogClick(row) {
-      // this.dataInfo = row
-      // this.isShowDialog = true
       this.$refs.inquiryDia.initDialog(row)
     },
     // 获取列表
-    getListPage(limit, offset) {
+    getListPage(limit = 10, offset = 1) {
       i_list(`limit=${limit}&offset=${offset}`, this.queryInfo).then(res => {
-        console.log(res)
         this.tableData = res
       })
     },
@@ -129,7 +121,7 @@
       this.selectInfo = { // 搜索框中的数据的数据
         supplierCode: '',
         supplierName: '',
-        preReviewResultName: ''
+        preReviewResult: ''
       }
     }
   }
diff --git a/src/views/supplier/review.vue b/src/views/supplier/review.vue
index 94f125c..41180e5 100644
--- a/src/views/supplier/review.vue
+++ b/src/views/supplier/review.vue
@@ -108,8 +108,8 @@
         inputReviewResult: ''
       },
       options: [
-        { label: '预审通过', value: '预审通过' },
-        { label: '预审不通过', value: '预审不通过' }
+        { label: '评审通过', value: '3' },
+        { label: '评审不通过', value: '4' }
       ]
     }
   },