diff --git a/src/api/supplier/supplier.js b/src/api/supplier/supplier.js
index fe31ad0..c908a64 100644
--- a/src/api/supplier/supplier.js
+++ b/src/api/supplier/supplier.js
@@ -42,8 +42,8 @@
   return instance.post(`/supplierQuarterlyEvaluate/listPage?${str}`, data)
 }
 // 历史评价不分页列表
-const historyEvaluate = () => {
-  return instance.post('/supplierQuarterlyEvaluate/history', {})
+const historyEvaluate = (data) => {
+  return instance.post('/supplierQuarterlyEvaluate/history', data)
 }
 
 // 新增
@@ -56,8 +56,8 @@
   return instance.post(`/supplierAnnualAssess/listPage?${str}`, data)
 }
 // 历史考核不分页列表
-const historyAssess = () => {
-  return instance.post('/supplierAnnualAssess/history', {})
+const historyAssess = (data) => {
+  return instance.post('/supplierAnnualAssess/history', data)
 }
 
 // 新增

diff --git a/src/api/supplier/supplier.js b/src/api/supplier/supplier.js
index fe31ad0..c908a64 100644
--- a/src/api/supplier/supplier.js
+++ b/src/api/supplier/supplier.js
@@ -42,8 +42,8 @@
   return instance.post(`/supplierQuarterlyEvaluate/listPage?${str}`, data)
 }
 // 历史评价不分页列表
-const historyEvaluate = () => {
-  return instance.post('/supplierQuarterlyEvaluate/history', {})
+const historyEvaluate = (data) => {
+  return instance.post('/supplierQuarterlyEvaluate/history', data)
 }
 
 // 新增
@@ -56,8 +56,8 @@
   return instance.post(`/supplierAnnualAssess/listPage?${str}`, data)
 }
 // 历史考核不分页列表
-const historyAssess = () => {
-  return instance.post('/supplierAnnualAssess/history', {})
+const historyAssess = (data) => {
+  return instance.post('/supplierAnnualAssess/history', data)
 }
 
 // 新增
diff --git a/src/views/supplier/evaluate.vue b/src/views/supplier/evaluate.vue
index 7653a58..fc318f0 100644
--- a/src/views/supplier/evaluate.vue
+++ b/src/views/supplier/evaluate.vue
@@ -57,7 +57,7 @@
         <el-table-column prop="quarterlyEvaluateDate" label="季度评价日期" width="150"/>
         <el-table-column header-align="center" width="200" align="center" fixed="right" label="操作">
           <template slot-scope="scope">
-            <el-button type="text" size="small" @click="hitstoryDialog(scope.row)">
+            <el-button type="text" size="small" @click="historyDialog(scope.row)">
               历史评价
             </el-button>
             <el-button type="text" size="small" @click="evaluateDialogClick(scope.row)">
@@ -76,7 +76,7 @@
         @setLimit="setLimit"
       />
     </div>
-    <historyEvaluateDialog v-if="isShowHistoryDialog" :data-info="dataInfo" @close="evaluateHistoryDialogClose" />
+    <history-evaluate-dialog ref="evaluateHis" />
     <evaluate-dialog
       ref="evaluateDialog"
                      @refreshList="selectData"
@@ -90,7 +90,7 @@
 <script>
 import GroupPage from '../../components/mycomponent/groupPage.vue'
 import EvaluateDialog from '@/views/supplier/evaluateDialog'
-import historyEvaluateDialog from './historyEvaluateDialog.vue'
+import HistoryEvaluateDialog from '@/views/supplier/historyEvaluateDialog'
 
 import { e_list } from '../../api/supplier/supplier'
 import { tableRowClassName } from '../../utils/myUtils/changeTableTr'
@@ -99,7 +99,7 @@
 
 export default { // 加入分页逻辑
   components: {
-    historyEvaluateDialog, EvaluateDialog, GroupPage
+    HistoryEvaluateDialog, EvaluateDialog, GroupPage
   },
   mixins: [listMixin],
   data() {
@@ -147,15 +147,8 @@
         }
       })
     },
-    hitstoryDialog(row) {
-      this.dataInfo = row
-      this.isShowHistoryDialog = true
-    },
-    evaluateHistoryDialogClose() {
-      this.isShowHistoryDialog = false
-    },
-    evaluateDialogClose() {
-      this.isShowDialog = false
+    historyDialog(row) {
+      this.$refs.evaluateHis.initHistoryDialog(row)
     },
     evaluateDialogClick(row) {
       this.$refs.evaluateDialog.initDialog(row)

diff --git a/src/api/supplier/supplier.js b/src/api/supplier/supplier.js
index fe31ad0..c908a64 100644
--- a/src/api/supplier/supplier.js
+++ b/src/api/supplier/supplier.js
@@ -42,8 +42,8 @@
   return instance.post(`/supplierQuarterlyEvaluate/listPage?${str}`, data)
 }
 // 历史评价不分页列表
-const historyEvaluate = () => {
-  return instance.post('/supplierQuarterlyEvaluate/history', {})
+const historyEvaluate = (data) => {
+  return instance.post('/supplierQuarterlyEvaluate/history', data)
 }
 
 // 新增
@@ -56,8 +56,8 @@
   return instance.post(`/supplierAnnualAssess/listPage?${str}`, data)
 }
 // 历史考核不分页列表
-const historyAssess = () => {
-  return instance.post('/supplierAnnualAssess/history', {})
+const historyAssess = (data) => {
+  return instance.post('/supplierAnnualAssess/history', data)
 }
 
 // 新增
diff --git a/src/views/supplier/evaluate.vue b/src/views/supplier/evaluate.vue
index 7653a58..fc318f0 100644
--- a/src/views/supplier/evaluate.vue
+++ b/src/views/supplier/evaluate.vue
@@ -57,7 +57,7 @@
         <el-table-column prop="quarterlyEvaluateDate" label="季度评价日期" width="150"/>
         <el-table-column header-align="center" width="200" align="center" fixed="right" label="操作">
           <template slot-scope="scope">
-            <el-button type="text" size="small" @click="hitstoryDialog(scope.row)">
+            <el-button type="text" size="small" @click="historyDialog(scope.row)">
               历史评价
             </el-button>
             <el-button type="text" size="small" @click="evaluateDialogClick(scope.row)">
@@ -76,7 +76,7 @@
         @setLimit="setLimit"
       />
     </div>
-    <historyEvaluateDialog v-if="isShowHistoryDialog" :data-info="dataInfo" @close="evaluateHistoryDialogClose" />
+    <history-evaluate-dialog ref="evaluateHis" />
     <evaluate-dialog
       ref="evaluateDialog"
                      @refreshList="selectData"
@@ -90,7 +90,7 @@
 <script>
 import GroupPage from '../../components/mycomponent/groupPage.vue'
 import EvaluateDialog from '@/views/supplier/evaluateDialog'
-import historyEvaluateDialog from './historyEvaluateDialog.vue'
+import HistoryEvaluateDialog from '@/views/supplier/historyEvaluateDialog'
 
 import { e_list } from '../../api/supplier/supplier'
 import { tableRowClassName } from '../../utils/myUtils/changeTableTr'
@@ -99,7 +99,7 @@
 
 export default { // 加入分页逻辑
   components: {
-    historyEvaluateDialog, EvaluateDialog, GroupPage
+    HistoryEvaluateDialog, EvaluateDialog, GroupPage
   },
   mixins: [listMixin],
   data() {
@@ -147,15 +147,8 @@
         }
       })
     },
-    hitstoryDialog(row) {
-      this.dataInfo = row
-      this.isShowHistoryDialog = true
-    },
-    evaluateHistoryDialogClose() {
-      this.isShowHistoryDialog = false
-    },
-    evaluateDialogClose() {
-      this.isShowDialog = false
+    historyDialog(row) {
+      this.$refs.evaluateHis.initHistoryDialog(row)
     },
     evaluateDialogClick(row) {
       this.$refs.evaluateDialog.initDialog(row)
diff --git a/src/views/supplier/evaluateDialog.vue b/src/views/supplier/evaluateDialog.vue
index b217191..0430118 100644
--- a/src/views/supplier/evaluateDialog.vue
+++ b/src/views/supplier/evaluateDialog.vue
@@ -1,6 +1,6 @@
 <!--季度评价弹窗-->
 <template>
-  <el-dialog title="季度评价" width="975px" :visible.sync="isShowInfo" append-to-body @close="close">
+  <el-dialog title="季度评价" width="60%" :visible.sync="isShowInfo" append-to-body :close-on-click-modal="false">
     <el-form ref="evaluateForm" :model="addInfo" :rules="evaluateRules" size="medium" label-width="150px">
       <el-row style="margin-top: 20px">
         <el-col :span="10">

diff --git a/src/api/supplier/supplier.js b/src/api/supplier/supplier.js
index fe31ad0..c908a64 100644
--- a/src/api/supplier/supplier.js
+++ b/src/api/supplier/supplier.js
@@ -42,8 +42,8 @@
   return instance.post(`/supplierQuarterlyEvaluate/listPage?${str}`, data)
 }
 // 历史评价不分页列表
-const historyEvaluate = () => {
-  return instance.post('/supplierQuarterlyEvaluate/history', {})
+const historyEvaluate = (data) => {
+  return instance.post('/supplierQuarterlyEvaluate/history', data)
 }
 
 // 新增
@@ -56,8 +56,8 @@
   return instance.post(`/supplierAnnualAssess/listPage?${str}`, data)
 }
 // 历史考核不分页列表
-const historyAssess = () => {
-  return instance.post('/supplierAnnualAssess/history', {})
+const historyAssess = (data) => {
+  return instance.post('/supplierAnnualAssess/history', data)
 }
 
 // 新增
diff --git a/src/views/supplier/evaluate.vue b/src/views/supplier/evaluate.vue
index 7653a58..fc318f0 100644
--- a/src/views/supplier/evaluate.vue
+++ b/src/views/supplier/evaluate.vue
@@ -57,7 +57,7 @@
         <el-table-column prop="quarterlyEvaluateDate" label="季度评价日期" width="150"/>
         <el-table-column header-align="center" width="200" align="center" fixed="right" label="操作">
           <template slot-scope="scope">
-            <el-button type="text" size="small" @click="hitstoryDialog(scope.row)">
+            <el-button type="text" size="small" @click="historyDialog(scope.row)">
               历史评价
             </el-button>
             <el-button type="text" size="small" @click="evaluateDialogClick(scope.row)">
@@ -76,7 +76,7 @@
         @setLimit="setLimit"
       />
     </div>
-    <historyEvaluateDialog v-if="isShowHistoryDialog" :data-info="dataInfo" @close="evaluateHistoryDialogClose" />
+    <history-evaluate-dialog ref="evaluateHis" />
     <evaluate-dialog
       ref="evaluateDialog"
                      @refreshList="selectData"
@@ -90,7 +90,7 @@
 <script>
 import GroupPage from '../../components/mycomponent/groupPage.vue'
 import EvaluateDialog from '@/views/supplier/evaluateDialog'
-import historyEvaluateDialog from './historyEvaluateDialog.vue'
+import HistoryEvaluateDialog from '@/views/supplier/historyEvaluateDialog'
 
 import { e_list } from '../../api/supplier/supplier'
 import { tableRowClassName } from '../../utils/myUtils/changeTableTr'
@@ -99,7 +99,7 @@
 
 export default { // 加入分页逻辑
   components: {
-    historyEvaluateDialog, EvaluateDialog, GroupPage
+    HistoryEvaluateDialog, EvaluateDialog, GroupPage
   },
   mixins: [listMixin],
   data() {
@@ -147,15 +147,8 @@
         }
       })
     },
-    hitstoryDialog(row) {
-      this.dataInfo = row
-      this.isShowHistoryDialog = true
-    },
-    evaluateHistoryDialogClose() {
-      this.isShowHistoryDialog = false
-    },
-    evaluateDialogClose() {
-      this.isShowDialog = false
+    historyDialog(row) {
+      this.$refs.evaluateHis.initHistoryDialog(row)
     },
     evaluateDialogClick(row) {
       this.$refs.evaluateDialog.initDialog(row)
diff --git a/src/views/supplier/evaluateDialog.vue b/src/views/supplier/evaluateDialog.vue
index b217191..0430118 100644
--- a/src/views/supplier/evaluateDialog.vue
+++ b/src/views/supplier/evaluateDialog.vue
@@ -1,6 +1,6 @@
 <!--季度评价弹窗-->
 <template>
-  <el-dialog title="季度评价" width="975px" :visible.sync="isShowInfo" append-to-body @close="close">
+  <el-dialog title="季度评价" width="60%" :visible.sync="isShowInfo" append-to-body :close-on-click-modal="false">
     <el-form ref="evaluateForm" :model="addInfo" :rules="evaluateRules" size="medium" label-width="150px">
       <el-row style="margin-top: 20px">
         <el-col :span="10">
diff --git a/src/views/supplier/historyEvaluateDialog.vue b/src/views/supplier/historyEvaluateDialog.vue
index 092fc37..e88b88c 100644
--- a/src/views/supplier/historyEvaluateDialog.vue
+++ b/src/views/supplier/historyEvaluateDialog.vue
@@ -1,113 +1,74 @@
 <!--历史评价弹窗-->
 <template>
-  <el-dialog title="历史评价" width="975px" :visible.sync="isShowInfo" append-to-body @close="close">
-    <div class="historyEvaluateDialog">
-      <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="evaluateQuarterlyName" label="评价季度" width="150" />
-          <el-table-column prop="quarterlyEvaluateResult" label="录库评审结果" width="150" />
-          <el-table-column prop="quarterlyEvaluateIllustration" label="录库评审说明" width="150" />
-          <el-table-column prop="quarterlyEvaluateDate" label="录库评审日期" width="150" />
-          <el-table-column prop="quarterlyEvaluateFile" 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 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 label="评价季度" width="200">
+        <template v-if="scope.row.evaluateYearName !== ''" slot-scope="scope">
+          {{ scope.row.evaluateYearName }}年{{ scope.row.evaluateQuarterlyName }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="evaluateQuarterlyName" label="评价结果" width="150"></el-table-column>
+      <el-table-column prop="quarterlyEvaluateIllustration" label="评审结果说明"></el-table-column>
+      <el-table-column prop="quarterlyEvaluateDate" label="评审日期" width="150" />
+      <el-table-column label="评审附件" width="300">
+        <template slot-scope="scope">
+          <el-link v-for="(item, index) in scope.row.quarterlyEvaluateFile" :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 dialogHeader from '../../components/mycomponent/dialog/dialogHeader.vue'
-import inputVue from '../../components/mycomponent/input/inputVue.vue'
-import RedStar from '../../components/mycomponent/redStar.vue'
-
-import { historyEvaluate } from '../../api/supplier/supplier'
+import { historyEvaluate } from '@/api/supplier/supplier'
 
 export default {
-  components: { inputVue, dialogHeader, RedStar },
-  props: {
-    dataInfo: {
-      type: Object,
-      dataInfo: {}
-    }
-  },
+  name: 'HistoryEvaluateDialog',
   data() {
     return {
-      isShowInfo: true,
-      tableData: []
+      isShowInfo: false,
+      tableData: [],
+      dataInfo: {
+
+      },
+      baseUrl: '',
+      labelStyle: {
+        width: '20%'
+      },
+      contentStyle: {
+        width: '30%'
+      }
     }
   },
-  mounted() {
-    this.getHistoryEvaluate()
-  },
   methods: {
-    // 生成序号
-    indexMethod(index) {
-      return index + 1
+    initHistoryDialog(row) {
+      this.dataInfo = row
+      this.getHistoryEvaluate(row.supplierCode)
+      this.isShowInfo = true
+      this.baseUrl = this.baseConfig.baseUrl + '/static/'
     },
-    // 合并表头
-    headerStyle({ row, column, rowIndex, columnIndex }) {
-      row[5].colSpan = 2 // 第三列的表头占据2个单元格
-      row[6].colSpan = 0
-      if (columnIndex === 6) {
-        return 'display: none'
-      }
-    },
-    close() {
-      this.$emit('close')
-    },
-    getHistoryEvaluate() {
-      historyEvaluate().then(res => {
-        console.log(res)
+    getHistoryEvaluate(supplierCode) {
+      historyEvaluate({ supplierCode: supplierCode }).then(res => {
+        res.forEach(record => {
+          if (record.quarterlyEvaluateDate !== '' && record.quarterlyEvaluateDate.length > 10) {
+            record.quarterlyEvaluateDate = record.quarterlyEvaluateDate.substring(0, 10)
+          }
+          if (record.quarterlyEvaluateFile !== '') {
+            record.quarterlyEvaluateFile = record.quarterlyEvaluateFile.split(',')
+          }
+        })
         this.tableData = res
       })
     }

diff --git a/src/api/supplier/supplier.js b/src/api/supplier/supplier.js
index fe31ad0..c908a64 100644
--- a/src/api/supplier/supplier.js
+++ b/src/api/supplier/supplier.js
@@ -42,8 +42,8 @@
   return instance.post(`/supplierQuarterlyEvaluate/listPage?${str}`, data)
 }
 // 历史评价不分页列表
-const historyEvaluate = () => {
-  return instance.post('/supplierQuarterlyEvaluate/history', {})
+const historyEvaluate = (data) => {
+  return instance.post('/supplierQuarterlyEvaluate/history', data)
 }
 
 // 新增
@@ -56,8 +56,8 @@
   return instance.post(`/supplierAnnualAssess/listPage?${str}`, data)
 }
 // 历史考核不分页列表
-const historyAssess = () => {
-  return instance.post('/supplierAnnualAssess/history', {})
+const historyAssess = (data) => {
+  return instance.post('/supplierAnnualAssess/history', data)
 }
 
 // 新增
diff --git a/src/views/supplier/evaluate.vue b/src/views/supplier/evaluate.vue
index 7653a58..fc318f0 100644
--- a/src/views/supplier/evaluate.vue
+++ b/src/views/supplier/evaluate.vue
@@ -57,7 +57,7 @@
         <el-table-column prop="quarterlyEvaluateDate" label="季度评价日期" width="150"/>
         <el-table-column header-align="center" width="200" align="center" fixed="right" label="操作">
           <template slot-scope="scope">
-            <el-button type="text" size="small" @click="hitstoryDialog(scope.row)">
+            <el-button type="text" size="small" @click="historyDialog(scope.row)">
               历史评价
             </el-button>
             <el-button type="text" size="small" @click="evaluateDialogClick(scope.row)">
@@ -76,7 +76,7 @@
         @setLimit="setLimit"
       />
     </div>
-    <historyEvaluateDialog v-if="isShowHistoryDialog" :data-info="dataInfo" @close="evaluateHistoryDialogClose" />
+    <history-evaluate-dialog ref="evaluateHis" />
     <evaluate-dialog
       ref="evaluateDialog"
                      @refreshList="selectData"
@@ -90,7 +90,7 @@
 <script>
 import GroupPage from '../../components/mycomponent/groupPage.vue'
 import EvaluateDialog from '@/views/supplier/evaluateDialog'
-import historyEvaluateDialog from './historyEvaluateDialog.vue'
+import HistoryEvaluateDialog from '@/views/supplier/historyEvaluateDialog'
 
 import { e_list } from '../../api/supplier/supplier'
 import { tableRowClassName } from '../../utils/myUtils/changeTableTr'
@@ -99,7 +99,7 @@
 
 export default { // 加入分页逻辑
   components: {
-    historyEvaluateDialog, EvaluateDialog, GroupPage
+    HistoryEvaluateDialog, EvaluateDialog, GroupPage
   },
   mixins: [listMixin],
   data() {
@@ -147,15 +147,8 @@
         }
       })
     },
-    hitstoryDialog(row) {
-      this.dataInfo = row
-      this.isShowHistoryDialog = true
-    },
-    evaluateHistoryDialogClose() {
-      this.isShowHistoryDialog = false
-    },
-    evaluateDialogClose() {
-      this.isShowDialog = false
+    historyDialog(row) {
+      this.$refs.evaluateHis.initHistoryDialog(row)
     },
     evaluateDialogClick(row) {
       this.$refs.evaluateDialog.initDialog(row)
diff --git a/src/views/supplier/evaluateDialog.vue b/src/views/supplier/evaluateDialog.vue
index b217191..0430118 100644
--- a/src/views/supplier/evaluateDialog.vue
+++ b/src/views/supplier/evaluateDialog.vue
@@ -1,6 +1,6 @@
 <!--季度评价弹窗-->
 <template>
-  <el-dialog title="季度评价" width="975px" :visible.sync="isShowInfo" append-to-body @close="close">
+  <el-dialog title="季度评价" width="60%" :visible.sync="isShowInfo" append-to-body :close-on-click-modal="false">
     <el-form ref="evaluateForm" :model="addInfo" :rules="evaluateRules" size="medium" label-width="150px">
       <el-row style="margin-top: 20px">
         <el-col :span="10">
diff --git a/src/views/supplier/historyEvaluateDialog.vue b/src/views/supplier/historyEvaluateDialog.vue
index 092fc37..e88b88c 100644
--- a/src/views/supplier/historyEvaluateDialog.vue
+++ b/src/views/supplier/historyEvaluateDialog.vue
@@ -1,113 +1,74 @@
 <!--历史评价弹窗-->
 <template>
-  <el-dialog title="历史评价" width="975px" :visible.sync="isShowInfo" append-to-body @close="close">
-    <div class="historyEvaluateDialog">
-      <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="evaluateQuarterlyName" label="评价季度" width="150" />
-          <el-table-column prop="quarterlyEvaluateResult" label="录库评审结果" width="150" />
-          <el-table-column prop="quarterlyEvaluateIllustration" label="录库评审说明" width="150" />
-          <el-table-column prop="quarterlyEvaluateDate" label="录库评审日期" width="150" />
-          <el-table-column prop="quarterlyEvaluateFile" 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 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 label="评价季度" width="200">
+        <template v-if="scope.row.evaluateYearName !== ''" slot-scope="scope">
+          {{ scope.row.evaluateYearName }}年{{ scope.row.evaluateQuarterlyName }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="evaluateQuarterlyName" label="评价结果" width="150"></el-table-column>
+      <el-table-column prop="quarterlyEvaluateIllustration" label="评审结果说明"></el-table-column>
+      <el-table-column prop="quarterlyEvaluateDate" label="评审日期" width="150" />
+      <el-table-column label="评审附件" width="300">
+        <template slot-scope="scope">
+          <el-link v-for="(item, index) in scope.row.quarterlyEvaluateFile" :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 dialogHeader from '../../components/mycomponent/dialog/dialogHeader.vue'
-import inputVue from '../../components/mycomponent/input/inputVue.vue'
-import RedStar from '../../components/mycomponent/redStar.vue'
-
-import { historyEvaluate } from '../../api/supplier/supplier'
+import { historyEvaluate } from '@/api/supplier/supplier'
 
 export default {
-  components: { inputVue, dialogHeader, RedStar },
-  props: {
-    dataInfo: {
-      type: Object,
-      dataInfo: {}
-    }
-  },
+  name: 'HistoryEvaluateDialog',
   data() {
     return {
-      isShowInfo: true,
-      tableData: []
+      isShowInfo: false,
+      tableData: [],
+      dataInfo: {
+
+      },
+      baseUrl: '',
+      labelStyle: {
+        width: '20%'
+      },
+      contentStyle: {
+        width: '30%'
+      }
     }
   },
-  mounted() {
-    this.getHistoryEvaluate()
-  },
   methods: {
-    // 生成序号
-    indexMethod(index) {
-      return index + 1
+    initHistoryDialog(row) {
+      this.dataInfo = row
+      this.getHistoryEvaluate(row.supplierCode)
+      this.isShowInfo = true
+      this.baseUrl = this.baseConfig.baseUrl + '/static/'
     },
-    // 合并表头
-    headerStyle({ row, column, rowIndex, columnIndex }) {
-      row[5].colSpan = 2 // 第三列的表头占据2个单元格
-      row[6].colSpan = 0
-      if (columnIndex === 6) {
-        return 'display: none'
-      }
-    },
-    close() {
-      this.$emit('close')
-    },
-    getHistoryEvaluate() {
-      historyEvaluate().then(res => {
-        console.log(res)
+    getHistoryEvaluate(supplierCode) {
+      historyEvaluate({ supplierCode: supplierCode }).then(res => {
+        res.forEach(record => {
+          if (record.quarterlyEvaluateDate !== '' && record.quarterlyEvaluateDate.length > 10) {
+            record.quarterlyEvaluateDate = record.quarterlyEvaluateDate.substring(0, 10)
+          }
+          if (record.quarterlyEvaluateFile !== '') {
+            record.quarterlyEvaluateFile = record.quarterlyEvaluateFile.split(',')
+          }
+        })
         this.tableData = res
       })
     }
diff --git a/src/views/supplier/inquiry.vue b/src/views/supplier/inquiry.vue
index 9d74382..ea17b15 100644
--- a/src/views/supplier/inquiry.vue
+++ b/src/views/supplier/inquiry.vue
@@ -43,7 +43,7 @@
         <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 type="text" size="small" @click="historyDialog(scope.row)">
               历史预审
             </el-button>
             <el-button :disabled="scope.row.preReviewResult == '1'" type="text" size="small" @click="inquiryDialogClick(scope.row)">
@@ -97,7 +97,7 @@
   },
   methods: {
     tableRowClassName: tableRowClassName,
-    hitstoryDialog(row) {
+    historyDialog(row) {
       this.$refs.inquiryHis.initHistoryDialog(row)
     },
     inquiryDialogClick(row) {

diff --git a/src/api/supplier/supplier.js b/src/api/supplier/supplier.js
index fe31ad0..c908a64 100644
--- a/src/api/supplier/supplier.js
+++ b/src/api/supplier/supplier.js
@@ -42,8 +42,8 @@
   return instance.post(`/supplierQuarterlyEvaluate/listPage?${str}`, data)
 }
 // 历史评价不分页列表
-const historyEvaluate = () => {
-  return instance.post('/supplierQuarterlyEvaluate/history', {})
+const historyEvaluate = (data) => {
+  return instance.post('/supplierQuarterlyEvaluate/history', data)
 }
 
 // 新增
@@ -56,8 +56,8 @@
   return instance.post(`/supplierAnnualAssess/listPage?${str}`, data)
 }
 // 历史考核不分页列表
-const historyAssess = () => {
-  return instance.post('/supplierAnnualAssess/history', {})
+const historyAssess = (data) => {
+  return instance.post('/supplierAnnualAssess/history', data)
 }
 
 // 新增
diff --git a/src/views/supplier/evaluate.vue b/src/views/supplier/evaluate.vue
index 7653a58..fc318f0 100644
--- a/src/views/supplier/evaluate.vue
+++ b/src/views/supplier/evaluate.vue
@@ -57,7 +57,7 @@
         <el-table-column prop="quarterlyEvaluateDate" label="季度评价日期" width="150"/>
         <el-table-column header-align="center" width="200" align="center" fixed="right" label="操作">
           <template slot-scope="scope">
-            <el-button type="text" size="small" @click="hitstoryDialog(scope.row)">
+            <el-button type="text" size="small" @click="historyDialog(scope.row)">
               历史评价
             </el-button>
             <el-button type="text" size="small" @click="evaluateDialogClick(scope.row)">
@@ -76,7 +76,7 @@
         @setLimit="setLimit"
       />
     </div>
-    <historyEvaluateDialog v-if="isShowHistoryDialog" :data-info="dataInfo" @close="evaluateHistoryDialogClose" />
+    <history-evaluate-dialog ref="evaluateHis" />
     <evaluate-dialog
       ref="evaluateDialog"
                      @refreshList="selectData"
@@ -90,7 +90,7 @@
 <script>
 import GroupPage from '../../components/mycomponent/groupPage.vue'
 import EvaluateDialog from '@/views/supplier/evaluateDialog'
-import historyEvaluateDialog from './historyEvaluateDialog.vue'
+import HistoryEvaluateDialog from '@/views/supplier/historyEvaluateDialog'
 
 import { e_list } from '../../api/supplier/supplier'
 import { tableRowClassName } from '../../utils/myUtils/changeTableTr'
@@ -99,7 +99,7 @@
 
 export default { // 加入分页逻辑
   components: {
-    historyEvaluateDialog, EvaluateDialog, GroupPage
+    HistoryEvaluateDialog, EvaluateDialog, GroupPage
   },
   mixins: [listMixin],
   data() {
@@ -147,15 +147,8 @@
         }
       })
     },
-    hitstoryDialog(row) {
-      this.dataInfo = row
-      this.isShowHistoryDialog = true
-    },
-    evaluateHistoryDialogClose() {
-      this.isShowHistoryDialog = false
-    },
-    evaluateDialogClose() {
-      this.isShowDialog = false
+    historyDialog(row) {
+      this.$refs.evaluateHis.initHistoryDialog(row)
     },
     evaluateDialogClick(row) {
       this.$refs.evaluateDialog.initDialog(row)
diff --git a/src/views/supplier/evaluateDialog.vue b/src/views/supplier/evaluateDialog.vue
index b217191..0430118 100644
--- a/src/views/supplier/evaluateDialog.vue
+++ b/src/views/supplier/evaluateDialog.vue
@@ -1,6 +1,6 @@
 <!--季度评价弹窗-->
 <template>
-  <el-dialog title="季度评价" width="975px" :visible.sync="isShowInfo" append-to-body @close="close">
+  <el-dialog title="季度评价" width="60%" :visible.sync="isShowInfo" append-to-body :close-on-click-modal="false">
     <el-form ref="evaluateForm" :model="addInfo" :rules="evaluateRules" size="medium" label-width="150px">
       <el-row style="margin-top: 20px">
         <el-col :span="10">
diff --git a/src/views/supplier/historyEvaluateDialog.vue b/src/views/supplier/historyEvaluateDialog.vue
index 092fc37..e88b88c 100644
--- a/src/views/supplier/historyEvaluateDialog.vue
+++ b/src/views/supplier/historyEvaluateDialog.vue
@@ -1,113 +1,74 @@
 <!--历史评价弹窗-->
 <template>
-  <el-dialog title="历史评价" width="975px" :visible.sync="isShowInfo" append-to-body @close="close">
-    <div class="historyEvaluateDialog">
-      <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="evaluateQuarterlyName" label="评价季度" width="150" />
-          <el-table-column prop="quarterlyEvaluateResult" label="录库评审结果" width="150" />
-          <el-table-column prop="quarterlyEvaluateIllustration" label="录库评审说明" width="150" />
-          <el-table-column prop="quarterlyEvaluateDate" label="录库评审日期" width="150" />
-          <el-table-column prop="quarterlyEvaluateFile" 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 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 label="评价季度" width="200">
+        <template v-if="scope.row.evaluateYearName !== ''" slot-scope="scope">
+          {{ scope.row.evaluateYearName }}年{{ scope.row.evaluateQuarterlyName }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="evaluateQuarterlyName" label="评价结果" width="150"></el-table-column>
+      <el-table-column prop="quarterlyEvaluateIllustration" label="评审结果说明"></el-table-column>
+      <el-table-column prop="quarterlyEvaluateDate" label="评审日期" width="150" />
+      <el-table-column label="评审附件" width="300">
+        <template slot-scope="scope">
+          <el-link v-for="(item, index) in scope.row.quarterlyEvaluateFile" :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 dialogHeader from '../../components/mycomponent/dialog/dialogHeader.vue'
-import inputVue from '../../components/mycomponent/input/inputVue.vue'
-import RedStar from '../../components/mycomponent/redStar.vue'
-
-import { historyEvaluate } from '../../api/supplier/supplier'
+import { historyEvaluate } from '@/api/supplier/supplier'
 
 export default {
-  components: { inputVue, dialogHeader, RedStar },
-  props: {
-    dataInfo: {
-      type: Object,
-      dataInfo: {}
-    }
-  },
+  name: 'HistoryEvaluateDialog',
   data() {
     return {
-      isShowInfo: true,
-      tableData: []
+      isShowInfo: false,
+      tableData: [],
+      dataInfo: {
+
+      },
+      baseUrl: '',
+      labelStyle: {
+        width: '20%'
+      },
+      contentStyle: {
+        width: '30%'
+      }
     }
   },
-  mounted() {
-    this.getHistoryEvaluate()
-  },
   methods: {
-    // 生成序号
-    indexMethod(index) {
-      return index + 1
+    initHistoryDialog(row) {
+      this.dataInfo = row
+      this.getHistoryEvaluate(row.supplierCode)
+      this.isShowInfo = true
+      this.baseUrl = this.baseConfig.baseUrl + '/static/'
     },
-    // 合并表头
-    headerStyle({ row, column, rowIndex, columnIndex }) {
-      row[5].colSpan = 2 // 第三列的表头占据2个单元格
-      row[6].colSpan = 0
-      if (columnIndex === 6) {
-        return 'display: none'
-      }
-    },
-    close() {
-      this.$emit('close')
-    },
-    getHistoryEvaluate() {
-      historyEvaluate().then(res => {
-        console.log(res)
+    getHistoryEvaluate(supplierCode) {
+      historyEvaluate({ supplierCode: supplierCode }).then(res => {
+        res.forEach(record => {
+          if (record.quarterlyEvaluateDate !== '' && record.quarterlyEvaluateDate.length > 10) {
+            record.quarterlyEvaluateDate = record.quarterlyEvaluateDate.substring(0, 10)
+          }
+          if (record.quarterlyEvaluateFile !== '') {
+            record.quarterlyEvaluateFile = record.quarterlyEvaluateFile.split(',')
+          }
+        })
         this.tableData = res
       })
     }
diff --git a/src/views/supplier/inquiry.vue b/src/views/supplier/inquiry.vue
index 9d74382..ea17b15 100644
--- a/src/views/supplier/inquiry.vue
+++ b/src/views/supplier/inquiry.vue
@@ -43,7 +43,7 @@
         <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 type="text" size="small" @click="historyDialog(scope.row)">
               历史预审
             </el-button>
             <el-button :disabled="scope.row.preReviewResult == '1'" type="text" size="small" @click="inquiryDialogClick(scope.row)">
@@ -97,7 +97,7 @@
   },
   methods: {
     tableRowClassName: tableRowClassName,
-    hitstoryDialog(row) {
+    historyDialog(row) {
       this.$refs.inquiryHis.initHistoryDialog(row)
     },
     inquiryDialogClick(row) {
diff --git a/src/views/supplier/review.vue b/src/views/supplier/review.vue
index 7a40096..09727b3 100644
--- a/src/views/supplier/review.vue
+++ b/src/views/supplier/review.vue
@@ -43,7 +43,7 @@
         <el-table-column prop="inputReviewDate" 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 type="text" size="small" @click="historyDialog(scope.row)">
               历史评审
             </el-button>
             <el-button :disabled="scope.row.inputReviewResult == '3'" type="text" size="small" @click="reviewDialogClick(scope.row)">
@@ -95,7 +95,7 @@
   },
   methods: {
     tableRowClassName: tableRowClassName,
-    hitstoryDialog(row) {
+    historyDialog(row) {
       this.$refs.reviewHis.initHistoryDialog(row)
     },
     reviewDialogClick(row) {

diff --git a/src/api/supplier/supplier.js b/src/api/supplier/supplier.js
index fe31ad0..c908a64 100644
--- a/src/api/supplier/supplier.js
+++ b/src/api/supplier/supplier.js
@@ -42,8 +42,8 @@
   return instance.post(`/supplierQuarterlyEvaluate/listPage?${str}`, data)
 }
 // 历史评价不分页列表
-const historyEvaluate = () => {
-  return instance.post('/supplierQuarterlyEvaluate/history', {})
+const historyEvaluate = (data) => {
+  return instance.post('/supplierQuarterlyEvaluate/history', data)
 }
 
 // 新增
@@ -56,8 +56,8 @@
   return instance.post(`/supplierAnnualAssess/listPage?${str}`, data)
 }
 // 历史考核不分页列表
-const historyAssess = () => {
-  return instance.post('/supplierAnnualAssess/history', {})
+const historyAssess = (data) => {
+  return instance.post('/supplierAnnualAssess/history', data)
 }
 
 // 新增
diff --git a/src/views/supplier/evaluate.vue b/src/views/supplier/evaluate.vue
index 7653a58..fc318f0 100644
--- a/src/views/supplier/evaluate.vue
+++ b/src/views/supplier/evaluate.vue
@@ -57,7 +57,7 @@
         <el-table-column prop="quarterlyEvaluateDate" label="季度评价日期" width="150"/>
         <el-table-column header-align="center" width="200" align="center" fixed="right" label="操作">
           <template slot-scope="scope">
-            <el-button type="text" size="small" @click="hitstoryDialog(scope.row)">
+            <el-button type="text" size="small" @click="historyDialog(scope.row)">
               历史评价
             </el-button>
             <el-button type="text" size="small" @click="evaluateDialogClick(scope.row)">
@@ -76,7 +76,7 @@
         @setLimit="setLimit"
       />
     </div>
-    <historyEvaluateDialog v-if="isShowHistoryDialog" :data-info="dataInfo" @close="evaluateHistoryDialogClose" />
+    <history-evaluate-dialog ref="evaluateHis" />
     <evaluate-dialog
       ref="evaluateDialog"
                      @refreshList="selectData"
@@ -90,7 +90,7 @@
 <script>
 import GroupPage from '../../components/mycomponent/groupPage.vue'
 import EvaluateDialog from '@/views/supplier/evaluateDialog'
-import historyEvaluateDialog from './historyEvaluateDialog.vue'
+import HistoryEvaluateDialog from '@/views/supplier/historyEvaluateDialog'
 
 import { e_list } from '../../api/supplier/supplier'
 import { tableRowClassName } from '../../utils/myUtils/changeTableTr'
@@ -99,7 +99,7 @@
 
 export default { // 加入分页逻辑
   components: {
-    historyEvaluateDialog, EvaluateDialog, GroupPage
+    HistoryEvaluateDialog, EvaluateDialog, GroupPage
   },
   mixins: [listMixin],
   data() {
@@ -147,15 +147,8 @@
         }
       })
     },
-    hitstoryDialog(row) {
-      this.dataInfo = row
-      this.isShowHistoryDialog = true
-    },
-    evaluateHistoryDialogClose() {
-      this.isShowHistoryDialog = false
-    },
-    evaluateDialogClose() {
-      this.isShowDialog = false
+    historyDialog(row) {
+      this.$refs.evaluateHis.initHistoryDialog(row)
     },
     evaluateDialogClick(row) {
       this.$refs.evaluateDialog.initDialog(row)
diff --git a/src/views/supplier/evaluateDialog.vue b/src/views/supplier/evaluateDialog.vue
index b217191..0430118 100644
--- a/src/views/supplier/evaluateDialog.vue
+++ b/src/views/supplier/evaluateDialog.vue
@@ -1,6 +1,6 @@
 <!--季度评价弹窗-->
 <template>
-  <el-dialog title="季度评价" width="975px" :visible.sync="isShowInfo" append-to-body @close="close">
+  <el-dialog title="季度评价" width="60%" :visible.sync="isShowInfo" append-to-body :close-on-click-modal="false">
     <el-form ref="evaluateForm" :model="addInfo" :rules="evaluateRules" size="medium" label-width="150px">
       <el-row style="margin-top: 20px">
         <el-col :span="10">
diff --git a/src/views/supplier/historyEvaluateDialog.vue b/src/views/supplier/historyEvaluateDialog.vue
index 092fc37..e88b88c 100644
--- a/src/views/supplier/historyEvaluateDialog.vue
+++ b/src/views/supplier/historyEvaluateDialog.vue
@@ -1,113 +1,74 @@
 <!--历史评价弹窗-->
 <template>
-  <el-dialog title="历史评价" width="975px" :visible.sync="isShowInfo" append-to-body @close="close">
-    <div class="historyEvaluateDialog">
-      <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="evaluateQuarterlyName" label="评价季度" width="150" />
-          <el-table-column prop="quarterlyEvaluateResult" label="录库评审结果" width="150" />
-          <el-table-column prop="quarterlyEvaluateIllustration" label="录库评审说明" width="150" />
-          <el-table-column prop="quarterlyEvaluateDate" label="录库评审日期" width="150" />
-          <el-table-column prop="quarterlyEvaluateFile" 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 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 label="评价季度" width="200">
+        <template v-if="scope.row.evaluateYearName !== ''" slot-scope="scope">
+          {{ scope.row.evaluateYearName }}年{{ scope.row.evaluateQuarterlyName }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="evaluateQuarterlyName" label="评价结果" width="150"></el-table-column>
+      <el-table-column prop="quarterlyEvaluateIllustration" label="评审结果说明"></el-table-column>
+      <el-table-column prop="quarterlyEvaluateDate" label="评审日期" width="150" />
+      <el-table-column label="评审附件" width="300">
+        <template slot-scope="scope">
+          <el-link v-for="(item, index) in scope.row.quarterlyEvaluateFile" :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 dialogHeader from '../../components/mycomponent/dialog/dialogHeader.vue'
-import inputVue from '../../components/mycomponent/input/inputVue.vue'
-import RedStar from '../../components/mycomponent/redStar.vue'
-
-import { historyEvaluate } from '../../api/supplier/supplier'
+import { historyEvaluate } from '@/api/supplier/supplier'
 
 export default {
-  components: { inputVue, dialogHeader, RedStar },
-  props: {
-    dataInfo: {
-      type: Object,
-      dataInfo: {}
-    }
-  },
+  name: 'HistoryEvaluateDialog',
   data() {
     return {
-      isShowInfo: true,
-      tableData: []
+      isShowInfo: false,
+      tableData: [],
+      dataInfo: {
+
+      },
+      baseUrl: '',
+      labelStyle: {
+        width: '20%'
+      },
+      contentStyle: {
+        width: '30%'
+      }
     }
   },
-  mounted() {
-    this.getHistoryEvaluate()
-  },
   methods: {
-    // 生成序号
-    indexMethod(index) {
-      return index + 1
+    initHistoryDialog(row) {
+      this.dataInfo = row
+      this.getHistoryEvaluate(row.supplierCode)
+      this.isShowInfo = true
+      this.baseUrl = this.baseConfig.baseUrl + '/static/'
     },
-    // 合并表头
-    headerStyle({ row, column, rowIndex, columnIndex }) {
-      row[5].colSpan = 2 // 第三列的表头占据2个单元格
-      row[6].colSpan = 0
-      if (columnIndex === 6) {
-        return 'display: none'
-      }
-    },
-    close() {
-      this.$emit('close')
-    },
-    getHistoryEvaluate() {
-      historyEvaluate().then(res => {
-        console.log(res)
+    getHistoryEvaluate(supplierCode) {
+      historyEvaluate({ supplierCode: supplierCode }).then(res => {
+        res.forEach(record => {
+          if (record.quarterlyEvaluateDate !== '' && record.quarterlyEvaluateDate.length > 10) {
+            record.quarterlyEvaluateDate = record.quarterlyEvaluateDate.substring(0, 10)
+          }
+          if (record.quarterlyEvaluateFile !== '') {
+            record.quarterlyEvaluateFile = record.quarterlyEvaluateFile.split(',')
+          }
+        })
         this.tableData = res
       })
     }
diff --git a/src/views/supplier/inquiry.vue b/src/views/supplier/inquiry.vue
index 9d74382..ea17b15 100644
--- a/src/views/supplier/inquiry.vue
+++ b/src/views/supplier/inquiry.vue
@@ -43,7 +43,7 @@
         <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 type="text" size="small" @click="historyDialog(scope.row)">
               历史预审
             </el-button>
             <el-button :disabled="scope.row.preReviewResult == '1'" type="text" size="small" @click="inquiryDialogClick(scope.row)">
@@ -97,7 +97,7 @@
   },
   methods: {
     tableRowClassName: tableRowClassName,
-    hitstoryDialog(row) {
+    historyDialog(row) {
       this.$refs.inquiryHis.initHistoryDialog(row)
     },
     inquiryDialogClick(row) {
diff --git a/src/views/supplier/review.vue b/src/views/supplier/review.vue
index 7a40096..09727b3 100644
--- a/src/views/supplier/review.vue
+++ b/src/views/supplier/review.vue
@@ -43,7 +43,7 @@
         <el-table-column prop="inputReviewDate" 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 type="text" size="small" @click="historyDialog(scope.row)">
               历史评审
             </el-button>
             <el-button :disabled="scope.row.inputReviewResult == '3'" type="text" size="small" @click="reviewDialogClick(scope.row)">
@@ -95,7 +95,7 @@
   },
   methods: {
     tableRowClassName: tableRowClassName,
-    hitstoryDialog(row) {
+    historyDialog(row) {
       this.$refs.reviewHis.initHistoryDialog(row)
     },
     reviewDialogClick(row) {
diff --git a/src/views/supplier/reviewDialog.vue b/src/views/supplier/reviewDialog.vue
index 4cb5c83..8559f94 100644
--- a/src/views/supplier/reviewDialog.vue
+++ b/src/views/supplier/reviewDialog.vue
@@ -1,6 +1,6 @@
 <!--录库评审弹窗-->
 <template>
-  <el-dialog title="录库评审" width="60%" :visible.sync="isShowInfo" append-to-body @close="close">
+  <el-dialog title="录库评审" width="60%" :visible.sync="isShowInfo" append-to-body :close-on-click-modal="false">
     <el-form ref="reviewForm" :model="addInfo" :rules="reviewRules" size="medium" label-width="150px">
       <el-row style="margin-top: 20px">
         <el-col :span="10">