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/components/mycomponent/dialog/inquiryDialog.vue b/src/components/mycomponent/dialog/inquiryDialog.vue
deleted file mode 100644
index a8834ef..0000000
--- a/src/components/mycomponent/dialog/inquiryDialog.vue
+++ /dev/null
@@ -1,228 +0,0 @@
-<!--资料预审弹窗-->
-<template>
-  <el-dialog title="资料预审" width="975px" :visible.sync="isShowInfo" append-to-body @close="close">
-    <div class="reviewDialog">
-      <div class="Dialog-input">
-        <div class="inputContent">
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.supplierCode"
-              title="供应商编号"
-              disabled
-              placeholder="请输入编号"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue title="资料预审结果" class="inputWidth">
-              <el-select v-model="addInfo.preReviewResultValue" clearable placeholder="请选择" style="width:200px">
-                <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
-              </el-select>
-            </input-vue>
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue title="资料预审日期" class="inputWidth">
-              <el-input
-                v-model="addInfo.preReviewDate"
-                placeholder="请选择日期"
-                suffix-icon="el-icon-date"
-                style="width:200px"
-              />
-            </input-vue>
-          </div>
-        </div>
-        <div class="inputContent">
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.supplierName"
-              title="供应商名称"
-              disabled
-              placeholder="请输入供应商名称"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <input-vue title="资料预审说明" class="inputWidth">
-              <el-input
-                v-model="addInfo.preReviewIllustration"
-                type="textarea"
-                :rows="2"
-                placeholder="请输入审核说明"
-                style="width:200px"
-              />
-            </input-vue>
-          </div>
-        </div>
-      </div>
-      <div class="imgContent">
-        <div class="img-box">
-          <el-upload
-            :headers="myHeaders"
-            class="upload-demo"
-            action="http://111.198.10.15:21403/file/uploadFile"
-            :on-preview="handlePreview"
-            :on-remove="handleRemove"
-            :on-success="handleSuccess"
-            :file-list="fileList"
-            list-type="picture"
-          >
-            <el-button size="small" type="primary">
-              上传资料预审结果
-            </el-button>
-            <div slot="tip" class="el-upload__tip">
-              只能上传jpg/png文件，且不超过500kb
-            </div>
-          </el-upload>
-        </div>
-      </div>
-      <div class="btnBox">
-        <el-button type="primary" class="save" @click="save">
-          保存
-        </el-button>
-        <el-button type="info" class="close" @click="close">
-          取消
-        </el-button>
-      </div>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import dialogHeader from './dialogHeader.vue'
-import inputVue from '../input/inputVue.vue'
-import RedStar from '../redStar.vue'
-
-import { Message } from 'element-ui'
-import { getToken } from '@/utils/auth'
-import { inquiryAdd } from '../../../api/supplier/supplier'
-export default {
-  components: { inputVue, dialogHeader, RedStar },
-  props: {
-    dataInfo: {
-      type: Object,
-      dataInfo: {}
-    }
-  },
-  data() {
-    return {
-      isShowInfo: true,
-      myHeaders: { token: getToken() },
-      options: [
-        { label: '预审通过', value: '预审通过' },
-        { label: '预审不通过', value: '预审不通过' }
-      ],
-      addInfo: {
-        supplierCode: '',
-        supplierName: '',
-        preReviewResultValue: '',
-        preReviewIllustration: '',
-        preReviewDate: '',
-        preReviewFile: ''
-      },
-      fileList: [
-      ]
-    }
-  },
-  watch: {
-    dataInfo: {
-      handler(val) {
-        console.log(val)
-        if (val != '') {
-          this.addInfo = {
-            supplierCode: val.supplierCode,
-            supplierName: val.supplierName
-          }
-          console.log(this.addInfo)
-        }
-      },
-      deep: true,
-      immediate: true
-    }
-  },
-  methods: {
-    close() {
-      this.$emit('close')
-    },
-    handleRemove(file, fileList) {
-      console.log(file, fileList)
-    },
-    handlePreview(file) {
-      console.log(file)
-    },
-    handleSuccess(response) {
-      console.log(response)
-      this.addInfo.preReviewFile = response.data.fileId
-    },
-    save() {
-      inquiryAdd(this.addInfo).then(res => {
-        console.log(res)
-        if (!res.code) {
-          this.close()
-          Message.success('保存成功')
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style lang='scss' scoped>
-.reviewDialog {
-  width: 975px;
-  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 {
-        width: 350px;
-        display: flex;
-        justify-content: space-between;
-        align-items: center;
-      }
-    }
-  }
-
-  .imgContent {
-    margin: 20px;
-    display: flex;
-
-    .img-box {
-      margin-right: 48px;
-      width: 100%;
-      height: 250px;
-      padding: 10px 40px;
-      border: 1px solid #000;
-
-    }
-  }
-
-  .btnBox {
-    padding: 30px;
-    box-sizing: border-box;
-    display: flex;
-    align-items: center;
-    justify-content: space-evenly;
-
-    .save,
-    .close {
-      width: 100px;
-    }
-
-  }
-}
-</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/components/mycomponent/dialog/inquiryDialog.vue b/src/components/mycomponent/dialog/inquiryDialog.vue
deleted file mode 100644
index a8834ef..0000000
--- a/src/components/mycomponent/dialog/inquiryDialog.vue
+++ /dev/null
@@ -1,228 +0,0 @@
-<!--资料预审弹窗-->
-<template>
-  <el-dialog title="资料预审" width="975px" :visible.sync="isShowInfo" append-to-body @close="close">
-    <div class="reviewDialog">
-      <div class="Dialog-input">
-        <div class="inputContent">
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.supplierCode"
-              title="供应商编号"
-              disabled
-              placeholder="请输入编号"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue title="资料预审结果" class="inputWidth">
-              <el-select v-model="addInfo.preReviewResultValue" clearable placeholder="请选择" style="width:200px">
-                <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
-              </el-select>
-            </input-vue>
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue title="资料预审日期" class="inputWidth">
-              <el-input
-                v-model="addInfo.preReviewDate"
-                placeholder="请选择日期"
-                suffix-icon="el-icon-date"
-                style="width:200px"
-              />
-            </input-vue>
-          </div>
-        </div>
-        <div class="inputContent">
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.supplierName"
-              title="供应商名称"
-              disabled
-              placeholder="请输入供应商名称"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <input-vue title="资料预审说明" class="inputWidth">
-              <el-input
-                v-model="addInfo.preReviewIllustration"
-                type="textarea"
-                :rows="2"
-                placeholder="请输入审核说明"
-                style="width:200px"
-              />
-            </input-vue>
-          </div>
-        </div>
-      </div>
-      <div class="imgContent">
-        <div class="img-box">
-          <el-upload
-            :headers="myHeaders"
-            class="upload-demo"
-            action="http://111.198.10.15:21403/file/uploadFile"
-            :on-preview="handlePreview"
-            :on-remove="handleRemove"
-            :on-success="handleSuccess"
-            :file-list="fileList"
-            list-type="picture"
-          >
-            <el-button size="small" type="primary">
-              上传资料预审结果
-            </el-button>
-            <div slot="tip" class="el-upload__tip">
-              只能上传jpg/png文件，且不超过500kb
-            </div>
-          </el-upload>
-        </div>
-      </div>
-      <div class="btnBox">
-        <el-button type="primary" class="save" @click="save">
-          保存
-        </el-button>
-        <el-button type="info" class="close" @click="close">
-          取消
-        </el-button>
-      </div>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import dialogHeader from './dialogHeader.vue'
-import inputVue from '../input/inputVue.vue'
-import RedStar from '../redStar.vue'
-
-import { Message } from 'element-ui'
-import { getToken } from '@/utils/auth'
-import { inquiryAdd } from '../../../api/supplier/supplier'
-export default {
-  components: { inputVue, dialogHeader, RedStar },
-  props: {
-    dataInfo: {
-      type: Object,
-      dataInfo: {}
-    }
-  },
-  data() {
-    return {
-      isShowInfo: true,
-      myHeaders: { token: getToken() },
-      options: [
-        { label: '预审通过', value: '预审通过' },
-        { label: '预审不通过', value: '预审不通过' }
-      ],
-      addInfo: {
-        supplierCode: '',
-        supplierName: '',
-        preReviewResultValue: '',
-        preReviewIllustration: '',
-        preReviewDate: '',
-        preReviewFile: ''
-      },
-      fileList: [
-      ]
-    }
-  },
-  watch: {
-    dataInfo: {
-      handler(val) {
-        console.log(val)
-        if (val != '') {
-          this.addInfo = {
-            supplierCode: val.supplierCode,
-            supplierName: val.supplierName
-          }
-          console.log(this.addInfo)
-        }
-      },
-      deep: true,
-      immediate: true
-    }
-  },
-  methods: {
-    close() {
-      this.$emit('close')
-    },
-    handleRemove(file, fileList) {
-      console.log(file, fileList)
-    },
-    handlePreview(file) {
-      console.log(file)
-    },
-    handleSuccess(response) {
-      console.log(response)
-      this.addInfo.preReviewFile = response.data.fileId
-    },
-    save() {
-      inquiryAdd(this.addInfo).then(res => {
-        console.log(res)
-        if (!res.code) {
-          this.close()
-          Message.success('保存成功')
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style lang='scss' scoped>
-.reviewDialog {
-  width: 975px;
-  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 {
-        width: 350px;
-        display: flex;
-        justify-content: space-between;
-        align-items: center;
-      }
-    }
-  }
-
-  .imgContent {
-    margin: 20px;
-    display: flex;
-
-    .img-box {
-      margin-right: 48px;
-      width: 100%;
-      height: 250px;
-      padding: 10px 40px;
-      border: 1px solid #000;
-
-    }
-  }
-
-  .btnBox {
-    padding: 30px;
-    box-sizing: border-box;
-    display: flex;
-    align-items: center;
-    justify-content: space-evenly;
-
-    .save,
-    .close {
-      width: 100px;
-    }
-
-  }
-}
-</style>
diff --git a/src/router/modules/supplierManagement.js b/src/router/modules/supplierManagement.js
index 4ad2c80..224d6b8 100644
--- a/src/router/modules/supplierManagement.js
+++ b/src/router/modules/supplierManagement.js
@@ -22,7 +22,7 @@
       path: '/inquiry',
       name: 'Inquiry',
       component: () => import('@/views/supplier/inquiry'), // 重定向的组件位置
-      meta: { title: '资料预审', icon: '', permission: '/supplier/inquire' }
+      meta: { title: '资料预审', icon: '', permission: '/supplier/inquiry' }
     },
     {
       path: '/review',

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/components/mycomponent/dialog/inquiryDialog.vue b/src/components/mycomponent/dialog/inquiryDialog.vue
deleted file mode 100644
index a8834ef..0000000
--- a/src/components/mycomponent/dialog/inquiryDialog.vue
+++ /dev/null
@@ -1,228 +0,0 @@
-<!--资料预审弹窗-->
-<template>
-  <el-dialog title="资料预审" width="975px" :visible.sync="isShowInfo" append-to-body @close="close">
-    <div class="reviewDialog">
-      <div class="Dialog-input">
-        <div class="inputContent">
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.supplierCode"
-              title="供应商编号"
-              disabled
-              placeholder="请输入编号"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue title="资料预审结果" class="inputWidth">
-              <el-select v-model="addInfo.preReviewResultValue" clearable placeholder="请选择" style="width:200px">
-                <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
-              </el-select>
-            </input-vue>
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue title="资料预审日期" class="inputWidth">
-              <el-input
-                v-model="addInfo.preReviewDate"
-                placeholder="请选择日期"
-                suffix-icon="el-icon-date"
-                style="width:200px"
-              />
-            </input-vue>
-          </div>
-        </div>
-        <div class="inputContent">
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.supplierName"
-              title="供应商名称"
-              disabled
-              placeholder="请输入供应商名称"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <input-vue title="资料预审说明" class="inputWidth">
-              <el-input
-                v-model="addInfo.preReviewIllustration"
-                type="textarea"
-                :rows="2"
-                placeholder="请输入审核说明"
-                style="width:200px"
-              />
-            </input-vue>
-          </div>
-        </div>
-      </div>
-      <div class="imgContent">
-        <div class="img-box">
-          <el-upload
-            :headers="myHeaders"
-            class="upload-demo"
-            action="http://111.198.10.15:21403/file/uploadFile"
-            :on-preview="handlePreview"
-            :on-remove="handleRemove"
-            :on-success="handleSuccess"
-            :file-list="fileList"
-            list-type="picture"
-          >
-            <el-button size="small" type="primary">
-              上传资料预审结果
-            </el-button>
-            <div slot="tip" class="el-upload__tip">
-              只能上传jpg/png文件，且不超过500kb
-            </div>
-          </el-upload>
-        </div>
-      </div>
-      <div class="btnBox">
-        <el-button type="primary" class="save" @click="save">
-          保存
-        </el-button>
-        <el-button type="info" class="close" @click="close">
-          取消
-        </el-button>
-      </div>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import dialogHeader from './dialogHeader.vue'
-import inputVue from '../input/inputVue.vue'
-import RedStar from '../redStar.vue'
-
-import { Message } from 'element-ui'
-import { getToken } from '@/utils/auth'
-import { inquiryAdd } from '../../../api/supplier/supplier'
-export default {
-  components: { inputVue, dialogHeader, RedStar },
-  props: {
-    dataInfo: {
-      type: Object,
-      dataInfo: {}
-    }
-  },
-  data() {
-    return {
-      isShowInfo: true,
-      myHeaders: { token: getToken() },
-      options: [
-        { label: '预审通过', value: '预审通过' },
-        { label: '预审不通过', value: '预审不通过' }
-      ],
-      addInfo: {
-        supplierCode: '',
-        supplierName: '',
-        preReviewResultValue: '',
-        preReviewIllustration: '',
-        preReviewDate: '',
-        preReviewFile: ''
-      },
-      fileList: [
-      ]
-    }
-  },
-  watch: {
-    dataInfo: {
-      handler(val) {
-        console.log(val)
-        if (val != '') {
-          this.addInfo = {
-            supplierCode: val.supplierCode,
-            supplierName: val.supplierName
-          }
-          console.log(this.addInfo)
-        }
-      },
-      deep: true,
-      immediate: true
-    }
-  },
-  methods: {
-    close() {
-      this.$emit('close')
-    },
-    handleRemove(file, fileList) {
-      console.log(file, fileList)
-    },
-    handlePreview(file) {
-      console.log(file)
-    },
-    handleSuccess(response) {
-      console.log(response)
-      this.addInfo.preReviewFile = response.data.fileId
-    },
-    save() {
-      inquiryAdd(this.addInfo).then(res => {
-        console.log(res)
-        if (!res.code) {
-          this.close()
-          Message.success('保存成功')
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style lang='scss' scoped>
-.reviewDialog {
-  width: 975px;
-  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 {
-        width: 350px;
-        display: flex;
-        justify-content: space-between;
-        align-items: center;
-      }
-    }
-  }
-
-  .imgContent {
-    margin: 20px;
-    display: flex;
-
-    .img-box {
-      margin-right: 48px;
-      width: 100%;
-      height: 250px;
-      padding: 10px 40px;
-      border: 1px solid #000;
-
-    }
-  }
-
-  .btnBox {
-    padding: 30px;
-    box-sizing: border-box;
-    display: flex;
-    align-items: center;
-    justify-content: space-evenly;
-
-    .save,
-    .close {
-      width: 100px;
-    }
-
-  }
-}
-</style>
diff --git a/src/router/modules/supplierManagement.js b/src/router/modules/supplierManagement.js
index 4ad2c80..224d6b8 100644
--- a/src/router/modules/supplierManagement.js
+++ b/src/router/modules/supplierManagement.js
@@ -22,7 +22,7 @@
       path: '/inquiry',
       name: 'Inquiry',
       component: () => import('@/views/supplier/inquiry'), // 重定向的组件位置
-      meta: { title: '资料预审', icon: '', permission: '/supplier/inquire' }
+      meta: { title: '资料预审', icon: '', permission: '/supplier/inquiry' }
     },
     {
       path: '/review',
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/components/mycomponent/dialog/inquiryDialog.vue b/src/components/mycomponent/dialog/inquiryDialog.vue
deleted file mode 100644
index a8834ef..0000000
--- a/src/components/mycomponent/dialog/inquiryDialog.vue
+++ /dev/null
@@ -1,228 +0,0 @@
-<!--资料预审弹窗-->
-<template>
-  <el-dialog title="资料预审" width="975px" :visible.sync="isShowInfo" append-to-body @close="close">
-    <div class="reviewDialog">
-      <div class="Dialog-input">
-        <div class="inputContent">
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.supplierCode"
-              title="供应商编号"
-              disabled
-              placeholder="请输入编号"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue title="资料预审结果" class="inputWidth">
-              <el-select v-model="addInfo.preReviewResultValue" clearable placeholder="请选择" style="width:200px">
-                <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
-              </el-select>
-            </input-vue>
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue title="资料预审日期" class="inputWidth">
-              <el-input
-                v-model="addInfo.preReviewDate"
-                placeholder="请选择日期"
-                suffix-icon="el-icon-date"
-                style="width:200px"
-              />
-            </input-vue>
-          </div>
-        </div>
-        <div class="inputContent">
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.supplierName"
-              title="供应商名称"
-              disabled
-              placeholder="请输入供应商名称"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <input-vue title="资料预审说明" class="inputWidth">
-              <el-input
-                v-model="addInfo.preReviewIllustration"
-                type="textarea"
-                :rows="2"
-                placeholder="请输入审核说明"
-                style="width:200px"
-              />
-            </input-vue>
-          </div>
-        </div>
-      </div>
-      <div class="imgContent">
-        <div class="img-box">
-          <el-upload
-            :headers="myHeaders"
-            class="upload-demo"
-            action="http://111.198.10.15:21403/file/uploadFile"
-            :on-preview="handlePreview"
-            :on-remove="handleRemove"
-            :on-success="handleSuccess"
-            :file-list="fileList"
-            list-type="picture"
-          >
-            <el-button size="small" type="primary">
-              上传资料预审结果
-            </el-button>
-            <div slot="tip" class="el-upload__tip">
-              只能上传jpg/png文件，且不超过500kb
-            </div>
-          </el-upload>
-        </div>
-      </div>
-      <div class="btnBox">
-        <el-button type="primary" class="save" @click="save">
-          保存
-        </el-button>
-        <el-button type="info" class="close" @click="close">
-          取消
-        </el-button>
-      </div>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import dialogHeader from './dialogHeader.vue'
-import inputVue from '../input/inputVue.vue'
-import RedStar from '../redStar.vue'
-
-import { Message } from 'element-ui'
-import { getToken } from '@/utils/auth'
-import { inquiryAdd } from '../../../api/supplier/supplier'
-export default {
-  components: { inputVue, dialogHeader, RedStar },
-  props: {
-    dataInfo: {
-      type: Object,
-      dataInfo: {}
-    }
-  },
-  data() {
-    return {
-      isShowInfo: true,
-      myHeaders: { token: getToken() },
-      options: [
-        { label: '预审通过', value: '预审通过' },
-        { label: '预审不通过', value: '预审不通过' }
-      ],
-      addInfo: {
-        supplierCode: '',
-        supplierName: '',
-        preReviewResultValue: '',
-        preReviewIllustration: '',
-        preReviewDate: '',
-        preReviewFile: ''
-      },
-      fileList: [
-      ]
-    }
-  },
-  watch: {
-    dataInfo: {
-      handler(val) {
-        console.log(val)
-        if (val != '') {
-          this.addInfo = {
-            supplierCode: val.supplierCode,
-            supplierName: val.supplierName
-          }
-          console.log(this.addInfo)
-        }
-      },
-      deep: true,
-      immediate: true
-    }
-  },
-  methods: {
-    close() {
-      this.$emit('close')
-    },
-    handleRemove(file, fileList) {
-      console.log(file, fileList)
-    },
-    handlePreview(file) {
-      console.log(file)
-    },
-    handleSuccess(response) {
-      console.log(response)
-      this.addInfo.preReviewFile = response.data.fileId
-    },
-    save() {
-      inquiryAdd(this.addInfo).then(res => {
-        console.log(res)
-        if (!res.code) {
-          this.close()
-          Message.success('保存成功')
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style lang='scss' scoped>
-.reviewDialog {
-  width: 975px;
-  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 {
-        width: 350px;
-        display: flex;
-        justify-content: space-between;
-        align-items: center;
-      }
-    }
-  }
-
-  .imgContent {
-    margin: 20px;
-    display: flex;
-
-    .img-box {
-      margin-right: 48px;
-      width: 100%;
-      height: 250px;
-      padding: 10px 40px;
-      border: 1px solid #000;
-
-    }
-  }
-
-  .btnBox {
-    padding: 30px;
-    box-sizing: border-box;
-    display: flex;
-    align-items: center;
-    justify-content: space-evenly;
-
-    .save,
-    .close {
-      width: 100px;
-    }
-
-  }
-}
-</style>
diff --git a/src/router/modules/supplierManagement.js b/src/router/modules/supplierManagement.js
index 4ad2c80..224d6b8 100644
--- a/src/router/modules/supplierManagement.js
+++ b/src/router/modules/supplierManagement.js
@@ -22,7 +22,7 @@
       path: '/inquiry',
       name: 'Inquiry',
       component: () => import('@/views/supplier/inquiry'), // 重定向的组件位置
-      meta: { title: '资料预审', icon: '', permission: '/supplier/inquire' }
+      meta: { title: '资料预审', icon: '', permission: '/supplier/inquiry' }
     },
     {
       path: '/review',
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 41c8d12..99eb582 100644
--- a/src/views/supplier/inquiry.vue
+++ b/src/views/supplier/inquiry.vue
@@ -3,33 +3,16 @@
   <div class="inquiry">
     <div class="inquiry-inputs">
       供应商编号
-      <el-input
-        v-model="selectInfo.supplierCode"
-        style="width: 200px"
-        placeholder="请输入编号"
-        clearable
-        class="inquiry-input"
-      />
+      <el-input v-model="selectInfo.supplierCode" style="width: 200px" placeholder="请输入编号" clearable class="inquiry-input"/>
 
       供应商名称
-      <el-input
-        v-model="selectInfo.supplierName"
-        style="width: 200px"
-        placeholder="请输入供应商名称"
-        clearable
-        class="inquiry-input"
-      />
+      <el-input v-model="selectInfo.supplierName" style="width: 200px" placeholder="请输入供应商名称" clearable class="inquiry-input"/>
 
       资料预审结果
-      <el-select
-        v-model="selectInfo.preReviewResult"
-        class="inquiry-select"
-        filterable
-        placeholder="请选择结果"
-        style="width: 200px"
-      >
+      <el-select v-model="selectInfo.preReviewResult" class="inquiry-select" clearable placeholder="请选择结果" style="width: 200px">
         <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
       </el-select>
+
       <div class="inquiry-btns">
         <el-button type="primary" class="inquiry-button" @click="selectData">
           查询
@@ -51,19 +34,19 @@
         :row-style="{ 'text-align': 'center' }"
         style="width: 100%"
       >
-        <el-table-column type="index" label="序号" width="180" />
+        <el-table-column type="index" label="序号" width="100" />
         <el-table-column prop="supplierCode" label="供应商编号" width="180" />
-        <el-table-column prop="supplierName" label="供应商名称" />
-        <el-table-column prop="supplierStatusName" label="供应商状态" />
-        <el-table-column prop="preReviewResultName" label="资料预审结果" />
+        <el-table-column prop="supplierName" label="供应商名称" width="400" />
+        <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" 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>
@@ -79,22 +62,23 @@
         @setLimit="setLimit"
       />
     </div>
-    <historyInquiryDialog v-if="isShowHistoryDialog" :data-info="dataInfo" @close="inquiryHistoryDialogClose" />
-    <inquiryDialog v-if="isShowDialog" :data-info="dataInfo" @close="inquiryDialogClose" />
+    <history-inquiry-dialog ref="inquiryHis" />
+    <inquiry-dialog ref="inquiryDia" @refreshList="selectData"/>
   </div>
 </template>
 
 <script>
 import GroupPage from '../../components/mycomponent/groupPage.vue'
-import inquiryDialog from '../../components/mycomponent/dialog/inquiryDialog.vue'
-import historyInquiryDialog from '../../components/mycomponent/dialog/historyInquiryDialog.vue'
+import InquiryDialog from '@/views/supplier/inquiryDialog'
+import HistoryInquiryDialog from '@/views/supplier/historyInquiryDialog'
 
 import { i_list } from '../../api/supplier/supplier'
 import { tableRowClassName } from '../../utils/myUtils/changeTableTr'
 import { listMixin } from '../../utils/myUtils/mixins/listPage'
 export default { // 加入分页逻辑
+  name: 'Inquiry',
   components: {
-    historyInquiryDialog, inquiryDialog, GroupPage
+    InquiryDialog, HistoryInquiryDialog, GroupPage
   },
   mixins: [listMixin],
   data() {
@@ -107,8 +91,8 @@
         preReviewResult: ''
       },
       options: [
-        { label: '预审通过', value: '预审通过' },
-        { label: '预审不通过', value: '预审不通过' }
+        { label: '预审通过', value: '1' },
+        { label: '预审不通过', value: '2' }
       ],
       dataInfo: {}// 传值
     }
@@ -118,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) {
-      console.log(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
       })
     },
@@ -145,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/components/mycomponent/dialog/inquiryDialog.vue b/src/components/mycomponent/dialog/inquiryDialog.vue
deleted file mode 100644
index a8834ef..0000000
--- a/src/components/mycomponent/dialog/inquiryDialog.vue
+++ /dev/null
@@ -1,228 +0,0 @@
-<!--资料预审弹窗-->
-<template>
-  <el-dialog title="资料预审" width="975px" :visible.sync="isShowInfo" append-to-body @close="close">
-    <div class="reviewDialog">
-      <div class="Dialog-input">
-        <div class="inputContent">
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.supplierCode"
-              title="供应商编号"
-              disabled
-              placeholder="请输入编号"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue title="资料预审结果" class="inputWidth">
-              <el-select v-model="addInfo.preReviewResultValue" clearable placeholder="请选择" style="width:200px">
-                <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
-              </el-select>
-            </input-vue>
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue title="资料预审日期" class="inputWidth">
-              <el-input
-                v-model="addInfo.preReviewDate"
-                placeholder="请选择日期"
-                suffix-icon="el-icon-date"
-                style="width:200px"
-              />
-            </input-vue>
-          </div>
-        </div>
-        <div class="inputContent">
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.supplierName"
-              title="供应商名称"
-              disabled
-              placeholder="请输入供应商名称"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <input-vue title="资料预审说明" class="inputWidth">
-              <el-input
-                v-model="addInfo.preReviewIllustration"
-                type="textarea"
-                :rows="2"
-                placeholder="请输入审核说明"
-                style="width:200px"
-              />
-            </input-vue>
-          </div>
-        </div>
-      </div>
-      <div class="imgContent">
-        <div class="img-box">
-          <el-upload
-            :headers="myHeaders"
-            class="upload-demo"
-            action="http://111.198.10.15:21403/file/uploadFile"
-            :on-preview="handlePreview"
-            :on-remove="handleRemove"
-            :on-success="handleSuccess"
-            :file-list="fileList"
-            list-type="picture"
-          >
-            <el-button size="small" type="primary">
-              上传资料预审结果
-            </el-button>
-            <div slot="tip" class="el-upload__tip">
-              只能上传jpg/png文件，且不超过500kb
-            </div>
-          </el-upload>
-        </div>
-      </div>
-      <div class="btnBox">
-        <el-button type="primary" class="save" @click="save">
-          保存
-        </el-button>
-        <el-button type="info" class="close" @click="close">
-          取消
-        </el-button>
-      </div>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import dialogHeader from './dialogHeader.vue'
-import inputVue from '../input/inputVue.vue'
-import RedStar from '../redStar.vue'
-
-import { Message } from 'element-ui'
-import { getToken } from '@/utils/auth'
-import { inquiryAdd } from '../../../api/supplier/supplier'
-export default {
-  components: { inputVue, dialogHeader, RedStar },
-  props: {
-    dataInfo: {
-      type: Object,
-      dataInfo: {}
-    }
-  },
-  data() {
-    return {
-      isShowInfo: true,
-      myHeaders: { token: getToken() },
-      options: [
-        { label: '预审通过', value: '预审通过' },
-        { label: '预审不通过', value: '预审不通过' }
-      ],
-      addInfo: {
-        supplierCode: '',
-        supplierName: '',
-        preReviewResultValue: '',
-        preReviewIllustration: '',
-        preReviewDate: '',
-        preReviewFile: ''
-      },
-      fileList: [
-      ]
-    }
-  },
-  watch: {
-    dataInfo: {
-      handler(val) {
-        console.log(val)
-        if (val != '') {
-          this.addInfo = {
-            supplierCode: val.supplierCode,
-            supplierName: val.supplierName
-          }
-          console.log(this.addInfo)
-        }
-      },
-      deep: true,
-      immediate: true
-    }
-  },
-  methods: {
-    close() {
-      this.$emit('close')
-    },
-    handleRemove(file, fileList) {
-      console.log(file, fileList)
-    },
-    handlePreview(file) {
-      console.log(file)
-    },
-    handleSuccess(response) {
-      console.log(response)
-      this.addInfo.preReviewFile = response.data.fileId
-    },
-    save() {
-      inquiryAdd(this.addInfo).then(res => {
-        console.log(res)
-        if (!res.code) {
-          this.close()
-          Message.success('保存成功')
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style lang='scss' scoped>
-.reviewDialog {
-  width: 975px;
-  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 {
-        width: 350px;
-        display: flex;
-        justify-content: space-between;
-        align-items: center;
-      }
-    }
-  }
-
-  .imgContent {
-    margin: 20px;
-    display: flex;
-
-    .img-box {
-      margin-right: 48px;
-      width: 100%;
-      height: 250px;
-      padding: 10px 40px;
-      border: 1px solid #000;
-
-    }
-  }
-
-  .btnBox {
-    padding: 30px;
-    box-sizing: border-box;
-    display: flex;
-    align-items: center;
-    justify-content: space-evenly;
-
-    .save,
-    .close {
-      width: 100px;
-    }
-
-  }
-}
-</style>
diff --git a/src/router/modules/supplierManagement.js b/src/router/modules/supplierManagement.js
index 4ad2c80..224d6b8 100644
--- a/src/router/modules/supplierManagement.js
+++ b/src/router/modules/supplierManagement.js
@@ -22,7 +22,7 @@
       path: '/inquiry',
       name: 'Inquiry',
       component: () => import('@/views/supplier/inquiry'), // 重定向的组件位置
-      meta: { title: '资料预审', icon: '', permission: '/supplier/inquire' }
+      meta: { title: '资料预审', icon: '', permission: '/supplier/inquiry' }
     },
     {
       path: '/review',
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 41c8d12..99eb582 100644
--- a/src/views/supplier/inquiry.vue
+++ b/src/views/supplier/inquiry.vue
@@ -3,33 +3,16 @@
   <div class="inquiry">
     <div class="inquiry-inputs">
       供应商编号
-      <el-input
-        v-model="selectInfo.supplierCode"
-        style="width: 200px"
-        placeholder="请输入编号"
-        clearable
-        class="inquiry-input"
-      />
+      <el-input v-model="selectInfo.supplierCode" style="width: 200px" placeholder="请输入编号" clearable class="inquiry-input"/>
 
       供应商名称
-      <el-input
-        v-model="selectInfo.supplierName"
-        style="width: 200px"
-        placeholder="请输入供应商名称"
-        clearable
-        class="inquiry-input"
-      />
+      <el-input v-model="selectInfo.supplierName" style="width: 200px" placeholder="请输入供应商名称" clearable class="inquiry-input"/>
 
       资料预审结果
-      <el-select
-        v-model="selectInfo.preReviewResult"
-        class="inquiry-select"
-        filterable
-        placeholder="请选择结果"
-        style="width: 200px"
-      >
+      <el-select v-model="selectInfo.preReviewResult" class="inquiry-select" clearable placeholder="请选择结果" style="width: 200px">
         <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
       </el-select>
+
       <div class="inquiry-btns">
         <el-button type="primary" class="inquiry-button" @click="selectData">
           查询
@@ -51,19 +34,19 @@
         :row-style="{ 'text-align': 'center' }"
         style="width: 100%"
       >
-        <el-table-column type="index" label="序号" width="180" />
+        <el-table-column type="index" label="序号" width="100" />
         <el-table-column prop="supplierCode" label="供应商编号" width="180" />
-        <el-table-column prop="supplierName" label="供应商名称" />
-        <el-table-column prop="supplierStatusName" label="供应商状态" />
-        <el-table-column prop="preReviewResultName" label="资料预审结果" />
+        <el-table-column prop="supplierName" label="供应商名称" width="400" />
+        <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" 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>
@@ -79,22 +62,23 @@
         @setLimit="setLimit"
       />
     </div>
-    <historyInquiryDialog v-if="isShowHistoryDialog" :data-info="dataInfo" @close="inquiryHistoryDialogClose" />
-    <inquiryDialog v-if="isShowDialog" :data-info="dataInfo" @close="inquiryDialogClose" />
+    <history-inquiry-dialog ref="inquiryHis" />
+    <inquiry-dialog ref="inquiryDia" @refreshList="selectData"/>
   </div>
 </template>
 
 <script>
 import GroupPage from '../../components/mycomponent/groupPage.vue'
-import inquiryDialog from '../../components/mycomponent/dialog/inquiryDialog.vue'
-import historyInquiryDialog from '../../components/mycomponent/dialog/historyInquiryDialog.vue'
+import InquiryDialog from '@/views/supplier/inquiryDialog'
+import HistoryInquiryDialog from '@/views/supplier/historyInquiryDialog'
 
 import { i_list } from '../../api/supplier/supplier'
 import { tableRowClassName } from '../../utils/myUtils/changeTableTr'
 import { listMixin } from '../../utils/myUtils/mixins/listPage'
 export default { // 加入分页逻辑
+  name: 'Inquiry',
   components: {
-    historyInquiryDialog, inquiryDialog, GroupPage
+    InquiryDialog, HistoryInquiryDialog, GroupPage
   },
   mixins: [listMixin],
   data() {
@@ -107,8 +91,8 @@
         preReviewResult: ''
       },
       options: [
-        { label: '预审通过', value: '预审通过' },
-        { label: '预审不通过', value: '预审不通过' }
+        { label: '预审通过', value: '1' },
+        { label: '预审不通过', value: '2' }
       ],
       dataInfo: {}// 传值
     }
@@ -118,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) {
-      console.log(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
       })
     },
@@ -145,7 +121,7 @@
       this.selectInfo = { // 搜索框中的数据的数据
         supplierCode: '',
         supplierName: '',
-        preReviewResultName: ''
+        preReviewResult: ''
       }
     }
   }
diff --git a/src/views/supplier/inquiryDialog.vue b/src/views/supplier/inquiryDialog.vue
new file mode 100644
index 0000000..4719ef3
--- /dev/null
+++ b/src/views/supplier/inquiryDialog.vue
@@ -0,0 +1,320 @@
+<!--资料预审弹窗-->
+<template>
+  <el-dialog title="资料预审" width="60%" :visible.sync="isShowInfo" append-to-body :close-on-click-modal="false" @close="close">
+
+    <el-form ref="inquiryForm" :model="addInfo" :rules="inquiryRules" size="medium" label-width="150px">
+      <el-row style="margin-top: 20px">
+        <el-col :span="10">
+          <el-form-item label="供应商名称">
+            <el-input v-model="addInfo.supplierName" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="10">
+          <el-form-item label="供应商编号">
+            <el-input v-model="addInfo.supplierCode" disabled />
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row>
+        <el-col :span="10">
+          <el-form-item label="预审结果" prop="preReviewResult">
+            <el-switch
+              v-model="addInfo.preReviewResult"
+              active-color="#13ce66"
+              inactive-color="#ff4949"
+              :active-text="options[0].label"
+              :inactive-text="options[1].label"
+              :active-value="'1'"
+              :inactive-value="'2'"
+            >
+            </el-switch>
+          </el-form-item>
+        </el-col>
+        <el-col :span="10">
+          <el-form-item label="预审日期" prop="preReviewDate">
+            <el-date-picker v-model="addInfo.preReviewDate" type="date" value-format="yyyy-MM-dd" placeholder="请选择日期" style="width: 100%" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="20">
+          <el-form-item label="预审结果说明" prop="preReviewIllustration">
+            <el-input v-model="addInfo.preReviewIllustration" type="textarea" :rows="4" placeholder="请输入预审结果说明" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="20">
+          <el-form-item label="资料预审结果">
+            <el-upload
+              ref="preReviewFile"
+              action="action"
+              :file-list="preReviewFileList"
+              :http-request="uploadPreReviewFile"
+              :before-upload="handleBeforeUpload"
+              :on-remove="handlePreReviewFileFileRemove"
+              :on-exceed="preReviewFileExceed"
+              :on-preview="handlePreview"
+              :limit="5"
+              accept=".jpg,.jpeg,.png,.pdf,.doc,.docx,.zip,.rar"
+            >
+              <el-button type="primary" icon="el-icon-upload">
+                上传资料预审结果
+              </el-button>
+            </el-upload>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+
+    <div class="reviewDialog">
+      <div class="btnBox">
+        <el-button type="primary" class="save" @click="save">
+          保存
+        </el-button>
+        <el-button type="info" class="close" @click="close">
+          取消
+        </el-button>
+      </div>
+    </div>
+
+  </el-dialog>
+</template>
+
+<script>
+import { inquiryAdd } from '@/api/supplier/supplier'
+import { Uploadimg } from '@/api/common'
+import { getToday } from '@/utils/dateutils'
+export default {
+  name: 'InquiryDialog',
+  props: {
+    dataInfo: {
+      type: Object,
+      dataInfo: {}
+    }
+  },
+  computed: {
+    preReviewResult: function() {
+      if (this.addInfo.preReviewResult === '1') {
+        return '预审通过'
+      } else if (this.addInfo.preReviewResult === '2') {
+        return '预审不通过'
+      } else {
+        return ''
+      }
+    }
+  },
+  data() {
+    return {
+      isShowInfo: false,
+      options: [
+        { label: '预审通过', value: '1' },
+        { label: '预审不通过', value: '2' }
+      ],
+      addInfo: {
+        supplierCode: '',
+        supplierName: '',
+        preReviewResult: '1',
+        preReviewResultValue: '',
+        preReviewIllustration: '',
+        preReviewDate: '',
+        preReviewFile: ''
+      },
+      inquiryRules: {
+        preReviewResult: [{ required: true, message: '请选择预审结果', trigger: 'blur' }],
+        preReviewDate: [{ required: true, message: '请选择预审日期', trigger: 'blur' }]
+      },
+      preReviewFileList: [],
+      inquiryValid: false
+    }
+  },
+  methods: {
+    close() {
+      this.isShowInfo = false
+      this.$emit('refreshList')
+    },
+    initDialog(row) {
+      this.isShowInfo = true
+      if (row !== null) {
+        this.addInfo.supplierCode = row.supplierCode
+        this.addInfo.supplierName = row.supplierName
+        this.addInfo.preReviewDate = getToday('yyyy-MM-dd')
+      }
+    },
+    save() {
+      this.addInfo.preReviewResultValue = this.preReviewResult
+
+      this.validateForm()
+      if (this.inquiryValid === true) {
+        if (this.preReviewFileList.length > 0) {
+          for (const i in this.preReviewFileList) {
+            this.addInfo.preReviewFile += this.preReviewFileList[i].url + ','
+          }
+
+          this.addInfo.preReviewFile = this.addInfo.preReviewFile.substring(0, this.addInfo.preReviewFile.length - 1)
+        }
+
+        inquiryAdd(this.addInfo).then(res => {
+          if (!res.code) {
+            this.$message.success('保存成功')
+            this.clearForm()
+            this.close()
+          }
+        })
+      }
+    },
+    validateForm: function() {
+      this.$refs.inquiryForm.validate(valid => {
+        this.inquiryValid = valid
+      })
+    },
+    clearForm() {
+      this.addInfo = {
+        supplierCode: '',
+        supplierName: '',
+        preReviewResult: '1',
+        preReviewResultValue: '',
+        preReviewIllustration: '',
+        preReviewDate: '',
+        preReviewFile: ''
+      }
+      this.preReviewFileList = []
+      // 清除验证
+      this.$nextTick(() => {
+        this.$refs.inquiryForm.clearValidate()
+      })
+    },
+    uploadPreReviewFile(file) {
+      // 判断文件是否已经上传过
+      for (const i in this.preReviewFileList) {
+        if (this.preReviewFileList[i].name === file.name) {
+          this.$message.error('该文件已上传过，请选择其他文件')
+          this.handleFileNotUploaded(file, this.$refs.preReviewFile.uploadFiles)
+          return
+        }
+      }
+
+      Uploadimg(file).then(res => {
+        if (res.code === 200) {
+          this.preReviewFileList.push({
+            name: res.data.fileName,
+            url: res.data.fileId,
+            type: file.file.type
+          })
+          this.$message.success('文件上传成功')
+        }
+      })
+    },
+    handlePreReviewFileFileRemove(file) {
+      this.handleRemove(file, this.preReviewFileList)
+    },
+    preReviewFileExceed(file, fileList) {
+      this.handleExceed(file, this.preReviewFileList)
+    },
+    handlePreview(file) {
+      if (file.status === 'success') {
+        const base_url = this.baseConfig.baseUrl + '/static/'
+
+        // 已经上传成功的文件 直接在新窗口打开预览
+        window.open(base_url + file.url, '_blank')
+      }
+    },
+    // 上传前判断文件格式及大小
+    handleBeforeUpload(file) {
+      let res = true
+      // 判断文件格式
+      const isJPG = (file.type === 'image/jpeg') || (file.type === 'image/png')
+      const isPDF = file.type === 'application/pdf'
+      const isWord = (file.type === 'application/vnd.openxmlformats-officedocument.wordprocessingml.document') || (file.type === 'application/msword')
+      const isZip = (file.type === 'application/x-rar') || (file.type === 'application/zip')
+      if (!isJPG && !isPDF && !isWord && !isZip) {
+        this.$message.error('上传文件只能是 图片/PDF/WORD/压缩包 格式!')
+        res = false
+      }
+
+      // 判断文件大小
+      const isLt5M = file.size / 1024 / 1024 < 5
+      if (!isLt5M) {
+        this.$message.error('上传文件大小不能超过 5MB!')
+        res = false
+      }
+
+      return res
+    },
+    // 文件列表移除文件时的钩子
+    handleRemove(file, fileList) {
+      for (const i in fileList) {
+        if (fileList[i].name === file.name) {
+          fileList.splice(i, 1)
+          return
+        }
+      }
+    },
+    handleExceed(file, fileList) {
+      this.$message.warning('最多上传 5 个文件，请先删除再重新上传')
+    },
+    handleFileNotUploaded(file, fileList) {
+      for (const i in fileList) {
+        if (fileList[i].id === file.id && fileList[i].status !== 'success') {
+          fileList.splice(i, 1)
+        }
+      }
+    }
+  }
+}
+</script>
+
+<style lang='scss' scoped>
+.reviewDialog {
+  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 {
+        width: 350px;
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+      }
+    }
+  }
+
+  .imgContent {
+    margin: 20px;
+    display: flex;
+
+    .img-box {
+      margin-right: 48px;
+      width: 100%;
+      height: 250px;
+      padding: 10px 40px;
+      border: 1px solid #000;
+
+    }
+  }
+
+  .btnBox {
+    padding: 30px;
+    box-sizing: border-box;
+    display: flex;
+    align-items: center;
+    justify-content: space-evenly;
+
+    .save,
+    .close {
+      width: 100px;
+    }
+
+  }
+}
+</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/components/mycomponent/dialog/inquiryDialog.vue b/src/components/mycomponent/dialog/inquiryDialog.vue
deleted file mode 100644
index a8834ef..0000000
--- a/src/components/mycomponent/dialog/inquiryDialog.vue
+++ /dev/null
@@ -1,228 +0,0 @@
-<!--资料预审弹窗-->
-<template>
-  <el-dialog title="资料预审" width="975px" :visible.sync="isShowInfo" append-to-body @close="close">
-    <div class="reviewDialog">
-      <div class="Dialog-input">
-        <div class="inputContent">
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.supplierCode"
-              title="供应商编号"
-              disabled
-              placeholder="请输入编号"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue title="资料预审结果" class="inputWidth">
-              <el-select v-model="addInfo.preReviewResultValue" clearable placeholder="请选择" style="width:200px">
-                <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
-              </el-select>
-            </input-vue>
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue title="资料预审日期" class="inputWidth">
-              <el-input
-                v-model="addInfo.preReviewDate"
-                placeholder="请选择日期"
-                suffix-icon="el-icon-date"
-                style="width:200px"
-              />
-            </input-vue>
-          </div>
-        </div>
-        <div class="inputContent">
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.supplierName"
-              title="供应商名称"
-              disabled
-              placeholder="请输入供应商名称"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <input-vue title="资料预审说明" class="inputWidth">
-              <el-input
-                v-model="addInfo.preReviewIllustration"
-                type="textarea"
-                :rows="2"
-                placeholder="请输入审核说明"
-                style="width:200px"
-              />
-            </input-vue>
-          </div>
-        </div>
-      </div>
-      <div class="imgContent">
-        <div class="img-box">
-          <el-upload
-            :headers="myHeaders"
-            class="upload-demo"
-            action="http://111.198.10.15:21403/file/uploadFile"
-            :on-preview="handlePreview"
-            :on-remove="handleRemove"
-            :on-success="handleSuccess"
-            :file-list="fileList"
-            list-type="picture"
-          >
-            <el-button size="small" type="primary">
-              上传资料预审结果
-            </el-button>
-            <div slot="tip" class="el-upload__tip">
-              只能上传jpg/png文件，且不超过500kb
-            </div>
-          </el-upload>
-        </div>
-      </div>
-      <div class="btnBox">
-        <el-button type="primary" class="save" @click="save">
-          保存
-        </el-button>
-        <el-button type="info" class="close" @click="close">
-          取消
-        </el-button>
-      </div>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import dialogHeader from './dialogHeader.vue'
-import inputVue from '../input/inputVue.vue'
-import RedStar from '../redStar.vue'
-
-import { Message } from 'element-ui'
-import { getToken } from '@/utils/auth'
-import { inquiryAdd } from '../../../api/supplier/supplier'
-export default {
-  components: { inputVue, dialogHeader, RedStar },
-  props: {
-    dataInfo: {
-      type: Object,
-      dataInfo: {}
-    }
-  },
-  data() {
-    return {
-      isShowInfo: true,
-      myHeaders: { token: getToken() },
-      options: [
-        { label: '预审通过', value: '预审通过' },
-        { label: '预审不通过', value: '预审不通过' }
-      ],
-      addInfo: {
-        supplierCode: '',
-        supplierName: '',
-        preReviewResultValue: '',
-        preReviewIllustration: '',
-        preReviewDate: '',
-        preReviewFile: ''
-      },
-      fileList: [
-      ]
-    }
-  },
-  watch: {
-    dataInfo: {
-      handler(val) {
-        console.log(val)
-        if (val != '') {
-          this.addInfo = {
-            supplierCode: val.supplierCode,
-            supplierName: val.supplierName
-          }
-          console.log(this.addInfo)
-        }
-      },
-      deep: true,
-      immediate: true
-    }
-  },
-  methods: {
-    close() {
-      this.$emit('close')
-    },
-    handleRemove(file, fileList) {
-      console.log(file, fileList)
-    },
-    handlePreview(file) {
-      console.log(file)
-    },
-    handleSuccess(response) {
-      console.log(response)
-      this.addInfo.preReviewFile = response.data.fileId
-    },
-    save() {
-      inquiryAdd(this.addInfo).then(res => {
-        console.log(res)
-        if (!res.code) {
-          this.close()
-          Message.success('保存成功')
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style lang='scss' scoped>
-.reviewDialog {
-  width: 975px;
-  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 {
-        width: 350px;
-        display: flex;
-        justify-content: space-between;
-        align-items: center;
-      }
-    }
-  }
-
-  .imgContent {
-    margin: 20px;
-    display: flex;
-
-    .img-box {
-      margin-right: 48px;
-      width: 100%;
-      height: 250px;
-      padding: 10px 40px;
-      border: 1px solid #000;
-
-    }
-  }
-
-  .btnBox {
-    padding: 30px;
-    box-sizing: border-box;
-    display: flex;
-    align-items: center;
-    justify-content: space-evenly;
-
-    .save,
-    .close {
-      width: 100px;
-    }
-
-  }
-}
-</style>
diff --git a/src/router/modules/supplierManagement.js b/src/router/modules/supplierManagement.js
index 4ad2c80..224d6b8 100644
--- a/src/router/modules/supplierManagement.js
+++ b/src/router/modules/supplierManagement.js
@@ -22,7 +22,7 @@
       path: '/inquiry',
       name: 'Inquiry',
       component: () => import('@/views/supplier/inquiry'), // 重定向的组件位置
-      meta: { title: '资料预审', icon: '', permission: '/supplier/inquire' }
+      meta: { title: '资料预审', icon: '', permission: '/supplier/inquiry' }
     },
     {
       path: '/review',
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 41c8d12..99eb582 100644
--- a/src/views/supplier/inquiry.vue
+++ b/src/views/supplier/inquiry.vue
@@ -3,33 +3,16 @@
   <div class="inquiry">
     <div class="inquiry-inputs">
       供应商编号
-      <el-input
-        v-model="selectInfo.supplierCode"
-        style="width: 200px"
-        placeholder="请输入编号"
-        clearable
-        class="inquiry-input"
-      />
+      <el-input v-model="selectInfo.supplierCode" style="width: 200px" placeholder="请输入编号" clearable class="inquiry-input"/>
 
       供应商名称
-      <el-input
-        v-model="selectInfo.supplierName"
-        style="width: 200px"
-        placeholder="请输入供应商名称"
-        clearable
-        class="inquiry-input"
-      />
+      <el-input v-model="selectInfo.supplierName" style="width: 200px" placeholder="请输入供应商名称" clearable class="inquiry-input"/>
 
       资料预审结果
-      <el-select
-        v-model="selectInfo.preReviewResult"
-        class="inquiry-select"
-        filterable
-        placeholder="请选择结果"
-        style="width: 200px"
-      >
+      <el-select v-model="selectInfo.preReviewResult" class="inquiry-select" clearable placeholder="请选择结果" style="width: 200px">
         <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
       </el-select>
+
       <div class="inquiry-btns">
         <el-button type="primary" class="inquiry-button" @click="selectData">
           查询
@@ -51,19 +34,19 @@
         :row-style="{ 'text-align': 'center' }"
         style="width: 100%"
       >
-        <el-table-column type="index" label="序号" width="180" />
+        <el-table-column type="index" label="序号" width="100" />
         <el-table-column prop="supplierCode" label="供应商编号" width="180" />
-        <el-table-column prop="supplierName" label="供应商名称" />
-        <el-table-column prop="supplierStatusName" label="供应商状态" />
-        <el-table-column prop="preReviewResultName" label="资料预审结果" />
+        <el-table-column prop="supplierName" label="供应商名称" width="400" />
+        <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" 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>
@@ -79,22 +62,23 @@
         @setLimit="setLimit"
       />
     </div>
-    <historyInquiryDialog v-if="isShowHistoryDialog" :data-info="dataInfo" @close="inquiryHistoryDialogClose" />
-    <inquiryDialog v-if="isShowDialog" :data-info="dataInfo" @close="inquiryDialogClose" />
+    <history-inquiry-dialog ref="inquiryHis" />
+    <inquiry-dialog ref="inquiryDia" @refreshList="selectData"/>
   </div>
 </template>
 
 <script>
 import GroupPage from '../../components/mycomponent/groupPage.vue'
-import inquiryDialog from '../../components/mycomponent/dialog/inquiryDialog.vue'
-import historyInquiryDialog from '../../components/mycomponent/dialog/historyInquiryDialog.vue'
+import InquiryDialog from '@/views/supplier/inquiryDialog'
+import HistoryInquiryDialog from '@/views/supplier/historyInquiryDialog'
 
 import { i_list } from '../../api/supplier/supplier'
 import { tableRowClassName } from '../../utils/myUtils/changeTableTr'
 import { listMixin } from '../../utils/myUtils/mixins/listPage'
 export default { // 加入分页逻辑
+  name: 'Inquiry',
   components: {
-    historyInquiryDialog, inquiryDialog, GroupPage
+    InquiryDialog, HistoryInquiryDialog, GroupPage
   },
   mixins: [listMixin],
   data() {
@@ -107,8 +91,8 @@
         preReviewResult: ''
       },
       options: [
-        { label: '预审通过', value: '预审通过' },
-        { label: '预审不通过', value: '预审不通过' }
+        { label: '预审通过', value: '1' },
+        { label: '预审不通过', value: '2' }
       ],
       dataInfo: {}// 传值
     }
@@ -118,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) {
-      console.log(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
       })
     },
@@ -145,7 +121,7 @@
       this.selectInfo = { // 搜索框中的数据的数据
         supplierCode: '',
         supplierName: '',
-        preReviewResultName: ''
+        preReviewResult: ''
       }
     }
   }
diff --git a/src/views/supplier/inquiryDialog.vue b/src/views/supplier/inquiryDialog.vue
new file mode 100644
index 0000000..4719ef3
--- /dev/null
+++ b/src/views/supplier/inquiryDialog.vue
@@ -0,0 +1,320 @@
+<!--资料预审弹窗-->
+<template>
+  <el-dialog title="资料预审" width="60%" :visible.sync="isShowInfo" append-to-body :close-on-click-modal="false" @close="close">
+
+    <el-form ref="inquiryForm" :model="addInfo" :rules="inquiryRules" size="medium" label-width="150px">
+      <el-row style="margin-top: 20px">
+        <el-col :span="10">
+          <el-form-item label="供应商名称">
+            <el-input v-model="addInfo.supplierName" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="10">
+          <el-form-item label="供应商编号">
+            <el-input v-model="addInfo.supplierCode" disabled />
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row>
+        <el-col :span="10">
+          <el-form-item label="预审结果" prop="preReviewResult">
+            <el-switch
+              v-model="addInfo.preReviewResult"
+              active-color="#13ce66"
+              inactive-color="#ff4949"
+              :active-text="options[0].label"
+              :inactive-text="options[1].label"
+              :active-value="'1'"
+              :inactive-value="'2'"
+            >
+            </el-switch>
+          </el-form-item>
+        </el-col>
+        <el-col :span="10">
+          <el-form-item label="预审日期" prop="preReviewDate">
+            <el-date-picker v-model="addInfo.preReviewDate" type="date" value-format="yyyy-MM-dd" placeholder="请选择日期" style="width: 100%" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="20">
+          <el-form-item label="预审结果说明" prop="preReviewIllustration">
+            <el-input v-model="addInfo.preReviewIllustration" type="textarea" :rows="4" placeholder="请输入预审结果说明" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="20">
+          <el-form-item label="资料预审结果">
+            <el-upload
+              ref="preReviewFile"
+              action="action"
+              :file-list="preReviewFileList"
+              :http-request="uploadPreReviewFile"
+              :before-upload="handleBeforeUpload"
+              :on-remove="handlePreReviewFileFileRemove"
+              :on-exceed="preReviewFileExceed"
+              :on-preview="handlePreview"
+              :limit="5"
+              accept=".jpg,.jpeg,.png,.pdf,.doc,.docx,.zip,.rar"
+            >
+              <el-button type="primary" icon="el-icon-upload">
+                上传资料预审结果
+              </el-button>
+            </el-upload>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+
+    <div class="reviewDialog">
+      <div class="btnBox">
+        <el-button type="primary" class="save" @click="save">
+          保存
+        </el-button>
+        <el-button type="info" class="close" @click="close">
+          取消
+        </el-button>
+      </div>
+    </div>
+
+  </el-dialog>
+</template>
+
+<script>
+import { inquiryAdd } from '@/api/supplier/supplier'
+import { Uploadimg } from '@/api/common'
+import { getToday } from '@/utils/dateutils'
+export default {
+  name: 'InquiryDialog',
+  props: {
+    dataInfo: {
+      type: Object,
+      dataInfo: {}
+    }
+  },
+  computed: {
+    preReviewResult: function() {
+      if (this.addInfo.preReviewResult === '1') {
+        return '预审通过'
+      } else if (this.addInfo.preReviewResult === '2') {
+        return '预审不通过'
+      } else {
+        return ''
+      }
+    }
+  },
+  data() {
+    return {
+      isShowInfo: false,
+      options: [
+        { label: '预审通过', value: '1' },
+        { label: '预审不通过', value: '2' }
+      ],
+      addInfo: {
+        supplierCode: '',
+        supplierName: '',
+        preReviewResult: '1',
+        preReviewResultValue: '',
+        preReviewIllustration: '',
+        preReviewDate: '',
+        preReviewFile: ''
+      },
+      inquiryRules: {
+        preReviewResult: [{ required: true, message: '请选择预审结果', trigger: 'blur' }],
+        preReviewDate: [{ required: true, message: '请选择预审日期', trigger: 'blur' }]
+      },
+      preReviewFileList: [],
+      inquiryValid: false
+    }
+  },
+  methods: {
+    close() {
+      this.isShowInfo = false
+      this.$emit('refreshList')
+    },
+    initDialog(row) {
+      this.isShowInfo = true
+      if (row !== null) {
+        this.addInfo.supplierCode = row.supplierCode
+        this.addInfo.supplierName = row.supplierName
+        this.addInfo.preReviewDate = getToday('yyyy-MM-dd')
+      }
+    },
+    save() {
+      this.addInfo.preReviewResultValue = this.preReviewResult
+
+      this.validateForm()
+      if (this.inquiryValid === true) {
+        if (this.preReviewFileList.length > 0) {
+          for (const i in this.preReviewFileList) {
+            this.addInfo.preReviewFile += this.preReviewFileList[i].url + ','
+          }
+
+          this.addInfo.preReviewFile = this.addInfo.preReviewFile.substring(0, this.addInfo.preReviewFile.length - 1)
+        }
+
+        inquiryAdd(this.addInfo).then(res => {
+          if (!res.code) {
+            this.$message.success('保存成功')
+            this.clearForm()
+            this.close()
+          }
+        })
+      }
+    },
+    validateForm: function() {
+      this.$refs.inquiryForm.validate(valid => {
+        this.inquiryValid = valid
+      })
+    },
+    clearForm() {
+      this.addInfo = {
+        supplierCode: '',
+        supplierName: '',
+        preReviewResult: '1',
+        preReviewResultValue: '',
+        preReviewIllustration: '',
+        preReviewDate: '',
+        preReviewFile: ''
+      }
+      this.preReviewFileList = []
+      // 清除验证
+      this.$nextTick(() => {
+        this.$refs.inquiryForm.clearValidate()
+      })
+    },
+    uploadPreReviewFile(file) {
+      // 判断文件是否已经上传过
+      for (const i in this.preReviewFileList) {
+        if (this.preReviewFileList[i].name === file.name) {
+          this.$message.error('该文件已上传过，请选择其他文件')
+          this.handleFileNotUploaded(file, this.$refs.preReviewFile.uploadFiles)
+          return
+        }
+      }
+
+      Uploadimg(file).then(res => {
+        if (res.code === 200) {
+          this.preReviewFileList.push({
+            name: res.data.fileName,
+            url: res.data.fileId,
+            type: file.file.type
+          })
+          this.$message.success('文件上传成功')
+        }
+      })
+    },
+    handlePreReviewFileFileRemove(file) {
+      this.handleRemove(file, this.preReviewFileList)
+    },
+    preReviewFileExceed(file, fileList) {
+      this.handleExceed(file, this.preReviewFileList)
+    },
+    handlePreview(file) {
+      if (file.status === 'success') {
+        const base_url = this.baseConfig.baseUrl + '/static/'
+
+        // 已经上传成功的文件 直接在新窗口打开预览
+        window.open(base_url + file.url, '_blank')
+      }
+    },
+    // 上传前判断文件格式及大小
+    handleBeforeUpload(file) {
+      let res = true
+      // 判断文件格式
+      const isJPG = (file.type === 'image/jpeg') || (file.type === 'image/png')
+      const isPDF = file.type === 'application/pdf'
+      const isWord = (file.type === 'application/vnd.openxmlformats-officedocument.wordprocessingml.document') || (file.type === 'application/msword')
+      const isZip = (file.type === 'application/x-rar') || (file.type === 'application/zip')
+      if (!isJPG && !isPDF && !isWord && !isZip) {
+        this.$message.error('上传文件只能是 图片/PDF/WORD/压缩包 格式!')
+        res = false
+      }
+
+      // 判断文件大小
+      const isLt5M = file.size / 1024 / 1024 < 5
+      if (!isLt5M) {
+        this.$message.error('上传文件大小不能超过 5MB!')
+        res = false
+      }
+
+      return res
+    },
+    // 文件列表移除文件时的钩子
+    handleRemove(file, fileList) {
+      for (const i in fileList) {
+        if (fileList[i].name === file.name) {
+          fileList.splice(i, 1)
+          return
+        }
+      }
+    },
+    handleExceed(file, fileList) {
+      this.$message.warning('最多上传 5 个文件，请先删除再重新上传')
+    },
+    handleFileNotUploaded(file, fileList) {
+      for (const i in fileList) {
+        if (fileList[i].id === file.id && fileList[i].status !== 'success') {
+          fileList.splice(i, 1)
+        }
+      }
+    }
+  }
+}
+</script>
+
+<style lang='scss' scoped>
+.reviewDialog {
+  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 {
+        width: 350px;
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+      }
+    }
+  }
+
+  .imgContent {
+    margin: 20px;
+    display: flex;
+
+    .img-box {
+      margin-right: 48px;
+      width: 100%;
+      height: 250px;
+      padding: 10px 40px;
+      border: 1px solid #000;
+
+    }
+  }
+
+  .btnBox {
+    padding: 30px;
+    box-sizing: border-box;
+    display: flex;
+    align-items: center;
+    justify-content: space-evenly;
+
+    .save,
+    .close {
+      width: 100px;
+    }
+
+  }
+}
+</style>
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' }
       ]
     }
   },