diff --git a/src/api/supplier/supplier.js b/src/api/supplier/supplier.js
index 0fd037c..fe31ad0 100644
--- a/src/api/supplier/supplier.js
+++ b/src/api/supplier/supplier.js
@@ -48,7 +48,7 @@
 
 // 新增
 const evaluateAdd = (data) => {
-  return instance.post('/supplierInputReview/add', data)
+  return instance.post('/supplierQuarterlyEvaluate/add', data)
 }
 
 // 年度考核不分页列表

diff --git a/src/api/supplier/supplier.js b/src/api/supplier/supplier.js
index 0fd037c..fe31ad0 100644
--- a/src/api/supplier/supplier.js
+++ b/src/api/supplier/supplier.js
@@ -48,7 +48,7 @@
 
 // 新增
 const evaluateAdd = (data) => {
-  return instance.post('/supplierInputReview/add', data)
+  return instance.post('/supplierQuarterlyEvaluate/add', data)
 }
 
 // 年度考核不分页列表
diff --git a/src/components/mycomponent/dialog/assessDialog.vue b/src/components/mycomponent/dialog/assessDialog.vue
deleted file mode 100644
index 5bb387d..0000000
--- a/src/components/mycomponent/dialog/assessDialog.vue
+++ /dev/null
@@ -1,364 +0,0 @@
-<!--年度考核弹窗-->
-<template>
-  <el-dialog title="年度考核" width="975px" :visible.sync="isShowInfo" append-to-body @close="close">
-    <div class="assessDialog">
-      <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.assessAnnual" clearable placeholder="请选择" style="width:200px">
-                <el-option v-for="item in yearOptions" :key="item.value" :label="item.label" :value="item.value" />
-              </el-select>
-            </input-vue>
-          </div>
-          <div class="inputBox">
-            <input-vue
-              v-model="addInfo.annualAssessIllustration"
-              title="年度考核说明"
-              class="inputWidth"
-              placeholder="请输入年度考核说明"
-              width="200px"
-            />
-          </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">
-            <red-star />
-            <input-vue title="考核结果" class="inputWidth">
-              <el-select v-model="addInfo.annualAssessResult" clearable placeholder="请选择" style="width:200px">
-                <el-option v-for="item in resultOptions" :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.annualAssessDate"
-                placeholder="请选择日期"
-                suffix-icon="el-icon-date"
-                style="width:200px"
-              />
-            </input-vue>
-          </div>
-        </div>
-      </div>
-      <div class="imgContent">
-        <div class="img-box">
-          <div class="img-item">
-            <div v-if="fileName" class="title-box">
-              <div class="img-title">
-                {{ fileName }}
-              </div>
-              <div class="img-btn">
-                <el-button type="text" class="btn">
-                  下载
-                </el-button>
-              </div>
-            </div>
-            <el-upload
-              class="avatar-uploader"
-              :headers="myHeaders"
-              action="http://111.198.10.15:21403/file/uploadFile"
-              :show-file-list="false"
-              :on-success="handleAvatarSuccess"
-              :before-upload="beforeAvatarUpload"
-            >
-              <img v-if="imageUrl" :src="imageUrl" class="avatar">
-              <i v-else class="el-icon-plus avatar-uploader-icon" />
-            </el-upload>
-          </div>
-          <div class="img-item">
-            <div v-if="fileName2" class="title-box">
-              <div class="img-title">
-                {{ fileName2 }}
-              </div>
-              <div class="img-btn">
-                <el-button type="text" class="btn">
-                  下载
-                </el-button>
-              </div>
-            </div>
-            <el-upload
-              class="avatar-uploader"
-              :headers="myHeaders"
-              action="http://111.198.10.15:21403/file/uploadFile"
-              :show-file-list="false"
-              :on-success="handleAvatarSuccess2"
-              :before-upload="beforeAvatarUpload"
-            >
-              <img v-if="imageUrl2" :src="imageUrl2" class="avatar">
-              <i v-else class="el-icon-plus avatar-uploader-icon" />
-            </el-upload>
-          </div>
-        </div>
-        <div class="uploadbtn">
-          <el-button type="primary">
-            上传录库评审结果
-          </el-button>
-        </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 { getToken } from '@/utils/auth'
-import { Message } from 'element-ui'
-import { assessAdd } from '../../../api/supplier/supplier'
-export default {
-  components: { inputVue, dialogHeader, RedStar },
-  props: {
-    dataInfo: {
-      type: Object,
-      dataInfo: {}
-    }
-  },
-  data() {
-    return {
-      fileName: '',
-      imageUrl: '',
-      imageUrl2: '',
-      fileName2: '',
-      myHeaders: { token: getToken() },
-      isShowInfo: true,
-      yearOptions: [
-        { label: '2021', value: '2021' },
-        { label: '2022', value: '2022' }
-      ],
-      resultOptions: [
-        { label: 'A', value: 'A' },
-        { label: 'B', value: 'B' },
-        { label: 'C', value: 'C' }
-      ],
-      addInfo: {
-        supplierCode: '',
-        supplierName: '',
-        assessAnnual: '',
-        annualAssessResult: '',
-        annualAssessIllustration: '',
-        annualAssessDate: '',
-        annualAssessFile: ''
-      }
-    }
-  },
-  watch: {
-    dataInfo: {
-      handler(val) {
-        console.log(val)
-        if (val != '') {
-          const temp = { ...this.addInfo }
-          this.addInfo = {
-            supplierCode: val.supplierCode,
-            supplierName: val.supplierName,
-            assessAnnual: temp.assessAnnual,
-            annualAssessResult: temp.annualAssessResult,
-            annualAssessIllustration: temp.annualAssessIllustration,
-            annualAssessDate: temp.annualAssessDate,
-            annualAssessFile: temp.annualAssessFile
-          }
-          console.log(this.addInfo)
-        }
-      },
-      deep: true,
-      immediate: true
-    }
-  },
-  methods: {
-    close() {
-      this.$emit('close')
-    },
-    // 照片上传
-    handleAvatarSuccess(res, file) {
-      this.fileName = res.data.fileName
-      console.log(res, file)
-      this.imageUrl = URL.createObjectURL(file.raw)
-      console.log(this.addInfo.annualAssessFile, 'this.addInfo.annualAssessFile')
-      if (this.addInfo.annualAssessFile == '') {
-        console.log('1')
-        this.addInfo.annualAssessFile = res.data.fileId
-      } else {
-        console.log('2')
-        this.addInfo.annualAssessFile = this.addInfo.annualAssessFile + ',' + res.data.fileId
-      }
-      console.log(this.addInfo.annualAssessFile)
-    },
-    handleAvatarSuccess2(res, file) {
-      this.fileName2 = res.data.fileName
-      console.log(res, file)
-      this.imageUrl2 = URL.createObjectURL(file.raw)
-      if (this.addInfo.annualAssessFile == '') {
-        console.log('3')
-        this.addInfo.annualAssessFile = res.data.fileId
-      } else {
-        console.log('4')
-        this.addInfo.annualAssessFile = this.addInfo.annualAssessFile + ',' + res.data.fileId
-      }
-      console.log(this.addInfo.annualAssessFile)
-    },
-    beforeAvatarUpload(file) {
-      const isJPG = file.type === 'image/jpeg'
-      const isLt2M = file.size / 1024 / 1024 < 2
-
-      if (!isJPG) {
-        this.$message.error('上传头像图片只能是 JPG 格式!')
-      }
-      if (!isLt2M) {
-        this.$message.error('上传头像图片大小不能超过 2MB!')
-      }
-      return isJPG && isLt2M
-    },
-    save() {
-      assessAdd(this.addInfo).then(res => {
-        console.log(res)
-        if (!res.code) {
-          this.close()
-          Message.success('保存成功')
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style lang='scss' scoped>
-.assessDialog {
-  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: 600px;
-      height: 250px;
-      display: flex;
-      justify-content: space-between;
-      padding: 10px 40px;
-      border: 1px solid #000;
-
-      .img-item {
-        width: 178px;
-        height: 200px;
-
-        .title-box {
-          display: flex;
-          justify-content: space-between;
-
-          .img-title {
-            width: 150px;
-            white-space: nowrap;
-            overflow: hidden;
-            text-overflow: ellipsis;
-            margin-right: 20px;
-          }
-
-          .img-btn {
-            .btn {
-              padding: 0;
-            }
-          }
-        }
-      }
-    }
-  }
-
-  .btnBox {
-    padding: 30px;
-    box-sizing: border-box;
-    display: flex;
-    align-items: center;
-    justify-content: space-evenly;
-
-    .save,
-    .close {
-      width: 100px;
-    }
-
-  }
-}
-
-.avatar-uploader .el-upload {
-  border: 1px dashed #d9d9d9;
-  border-radius: 6px;
-  cursor: pointer;
-  position: relative;
-  overflow: hidden;
-}
-
-.avatar-uploader .el-upload:hover {
-  border-color: #409EFF;
-}
-
-.avatar-uploader-icon {
-  font-size: 28px;
-  color: #8c939d;
-  width: 178px;
-  height: 178px;
-  line-height: 178px;
-  text-align: center;
-}
-
-.avatar {
-  width: 178px;
-  height: 178px;
-  display: block;
-}
-</style>

diff --git a/src/api/supplier/supplier.js b/src/api/supplier/supplier.js
index 0fd037c..fe31ad0 100644
--- a/src/api/supplier/supplier.js
+++ b/src/api/supplier/supplier.js
@@ -48,7 +48,7 @@
 
 // 新增
 const evaluateAdd = (data) => {
-  return instance.post('/supplierInputReview/add', data)
+  return instance.post('/supplierQuarterlyEvaluate/add', data)
 }
 
 // 年度考核不分页列表
diff --git a/src/components/mycomponent/dialog/assessDialog.vue b/src/components/mycomponent/dialog/assessDialog.vue
deleted file mode 100644
index 5bb387d..0000000
--- a/src/components/mycomponent/dialog/assessDialog.vue
+++ /dev/null
@@ -1,364 +0,0 @@
-<!--年度考核弹窗-->
-<template>
-  <el-dialog title="年度考核" width="975px" :visible.sync="isShowInfo" append-to-body @close="close">
-    <div class="assessDialog">
-      <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.assessAnnual" clearable placeholder="请选择" style="width:200px">
-                <el-option v-for="item in yearOptions" :key="item.value" :label="item.label" :value="item.value" />
-              </el-select>
-            </input-vue>
-          </div>
-          <div class="inputBox">
-            <input-vue
-              v-model="addInfo.annualAssessIllustration"
-              title="年度考核说明"
-              class="inputWidth"
-              placeholder="请输入年度考核说明"
-              width="200px"
-            />
-          </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">
-            <red-star />
-            <input-vue title="考核结果" class="inputWidth">
-              <el-select v-model="addInfo.annualAssessResult" clearable placeholder="请选择" style="width:200px">
-                <el-option v-for="item in resultOptions" :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.annualAssessDate"
-                placeholder="请选择日期"
-                suffix-icon="el-icon-date"
-                style="width:200px"
-              />
-            </input-vue>
-          </div>
-        </div>
-      </div>
-      <div class="imgContent">
-        <div class="img-box">
-          <div class="img-item">
-            <div v-if="fileName" class="title-box">
-              <div class="img-title">
-                {{ fileName }}
-              </div>
-              <div class="img-btn">
-                <el-button type="text" class="btn">
-                  下载
-                </el-button>
-              </div>
-            </div>
-            <el-upload
-              class="avatar-uploader"
-              :headers="myHeaders"
-              action="http://111.198.10.15:21403/file/uploadFile"
-              :show-file-list="false"
-              :on-success="handleAvatarSuccess"
-              :before-upload="beforeAvatarUpload"
-            >
-              <img v-if="imageUrl" :src="imageUrl" class="avatar">
-              <i v-else class="el-icon-plus avatar-uploader-icon" />
-            </el-upload>
-          </div>
-          <div class="img-item">
-            <div v-if="fileName2" class="title-box">
-              <div class="img-title">
-                {{ fileName2 }}
-              </div>
-              <div class="img-btn">
-                <el-button type="text" class="btn">
-                  下载
-                </el-button>
-              </div>
-            </div>
-            <el-upload
-              class="avatar-uploader"
-              :headers="myHeaders"
-              action="http://111.198.10.15:21403/file/uploadFile"
-              :show-file-list="false"
-              :on-success="handleAvatarSuccess2"
-              :before-upload="beforeAvatarUpload"
-            >
-              <img v-if="imageUrl2" :src="imageUrl2" class="avatar">
-              <i v-else class="el-icon-plus avatar-uploader-icon" />
-            </el-upload>
-          </div>
-        </div>
-        <div class="uploadbtn">
-          <el-button type="primary">
-            上传录库评审结果
-          </el-button>
-        </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 { getToken } from '@/utils/auth'
-import { Message } from 'element-ui'
-import { assessAdd } from '../../../api/supplier/supplier'
-export default {
-  components: { inputVue, dialogHeader, RedStar },
-  props: {
-    dataInfo: {
-      type: Object,
-      dataInfo: {}
-    }
-  },
-  data() {
-    return {
-      fileName: '',
-      imageUrl: '',
-      imageUrl2: '',
-      fileName2: '',
-      myHeaders: { token: getToken() },
-      isShowInfo: true,
-      yearOptions: [
-        { label: '2021', value: '2021' },
-        { label: '2022', value: '2022' }
-      ],
-      resultOptions: [
-        { label: 'A', value: 'A' },
-        { label: 'B', value: 'B' },
-        { label: 'C', value: 'C' }
-      ],
-      addInfo: {
-        supplierCode: '',
-        supplierName: '',
-        assessAnnual: '',
-        annualAssessResult: '',
-        annualAssessIllustration: '',
-        annualAssessDate: '',
-        annualAssessFile: ''
-      }
-    }
-  },
-  watch: {
-    dataInfo: {
-      handler(val) {
-        console.log(val)
-        if (val != '') {
-          const temp = { ...this.addInfo }
-          this.addInfo = {
-            supplierCode: val.supplierCode,
-            supplierName: val.supplierName,
-            assessAnnual: temp.assessAnnual,
-            annualAssessResult: temp.annualAssessResult,
-            annualAssessIllustration: temp.annualAssessIllustration,
-            annualAssessDate: temp.annualAssessDate,
-            annualAssessFile: temp.annualAssessFile
-          }
-          console.log(this.addInfo)
-        }
-      },
-      deep: true,
-      immediate: true
-    }
-  },
-  methods: {
-    close() {
-      this.$emit('close')
-    },
-    // 照片上传
-    handleAvatarSuccess(res, file) {
-      this.fileName = res.data.fileName
-      console.log(res, file)
-      this.imageUrl = URL.createObjectURL(file.raw)
-      console.log(this.addInfo.annualAssessFile, 'this.addInfo.annualAssessFile')
-      if (this.addInfo.annualAssessFile == '') {
-        console.log('1')
-        this.addInfo.annualAssessFile = res.data.fileId
-      } else {
-        console.log('2')
-        this.addInfo.annualAssessFile = this.addInfo.annualAssessFile + ',' + res.data.fileId
-      }
-      console.log(this.addInfo.annualAssessFile)
-    },
-    handleAvatarSuccess2(res, file) {
-      this.fileName2 = res.data.fileName
-      console.log(res, file)
-      this.imageUrl2 = URL.createObjectURL(file.raw)
-      if (this.addInfo.annualAssessFile == '') {
-        console.log('3')
-        this.addInfo.annualAssessFile = res.data.fileId
-      } else {
-        console.log('4')
-        this.addInfo.annualAssessFile = this.addInfo.annualAssessFile + ',' + res.data.fileId
-      }
-      console.log(this.addInfo.annualAssessFile)
-    },
-    beforeAvatarUpload(file) {
-      const isJPG = file.type === 'image/jpeg'
-      const isLt2M = file.size / 1024 / 1024 < 2
-
-      if (!isJPG) {
-        this.$message.error('上传头像图片只能是 JPG 格式!')
-      }
-      if (!isLt2M) {
-        this.$message.error('上传头像图片大小不能超过 2MB!')
-      }
-      return isJPG && isLt2M
-    },
-    save() {
-      assessAdd(this.addInfo).then(res => {
-        console.log(res)
-        if (!res.code) {
-          this.close()
-          Message.success('保存成功')
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style lang='scss' scoped>
-.assessDialog {
-  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: 600px;
-      height: 250px;
-      display: flex;
-      justify-content: space-between;
-      padding: 10px 40px;
-      border: 1px solid #000;
-
-      .img-item {
-        width: 178px;
-        height: 200px;
-
-        .title-box {
-          display: flex;
-          justify-content: space-between;
-
-          .img-title {
-            width: 150px;
-            white-space: nowrap;
-            overflow: hidden;
-            text-overflow: ellipsis;
-            margin-right: 20px;
-          }
-
-          .img-btn {
-            .btn {
-              padding: 0;
-            }
-          }
-        }
-      }
-    }
-  }
-
-  .btnBox {
-    padding: 30px;
-    box-sizing: border-box;
-    display: flex;
-    align-items: center;
-    justify-content: space-evenly;
-
-    .save,
-    .close {
-      width: 100px;
-    }
-
-  }
-}
-
-.avatar-uploader .el-upload {
-  border: 1px dashed #d9d9d9;
-  border-radius: 6px;
-  cursor: pointer;
-  position: relative;
-  overflow: hidden;
-}
-
-.avatar-uploader .el-upload:hover {
-  border-color: #409EFF;
-}
-
-.avatar-uploader-icon {
-  font-size: 28px;
-  color: #8c939d;
-  width: 178px;
-  height: 178px;
-  line-height: 178px;
-  text-align: center;
-}
-
-.avatar {
-  width: 178px;
-  height: 178px;
-  display: block;
-}
-</style>
diff --git a/src/components/mycomponent/dialog/evaluateDialog.vue b/src/components/mycomponent/dialog/evaluateDialog.vue
deleted file mode 100644
index ba3ad75..0000000
--- a/src/components/mycomponent/dialog/evaluateDialog.vue
+++ /dev/null
@@ -1,365 +0,0 @@
-<!--季度评价弹窗-->
-<template>
-  <el-dialog title="季度评价" width="975px" :visible.sync="isShowInfo" append-to-body @close="close">
-    <div class="evaluateDialog">
-      <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.evaluateQuarterly" clearable placeholder="请选择" style="width:200px">
-                <el-option v-for="item in quarterOptions" :key="item.value" :label="item.label" :value="item.value" />
-              </el-select>
-            </input-vue>
-          </div>
-          <div class="inputBox">
-            <input-vue
-              v-model="addInfo.quarterlyEvaluateIllustration"
-              title="季度评价说明"
-              class="inputWidth"
-              placeholder="请输入季度评价说明"
-              width="200px"
-            />
-          </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">
-            <red-star />
-            <input-vue title="季度评价结果" class="inputWidth">
-              <el-select v-model="addInfo.quarterlyEvaluateResult" clearable placeholder="请选择" style="width:200px">
-                <el-option v-for="item in resultOptions" :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.quarterlyEvaluateDate"
-                placeholder="请选择日期"
-                suffix-icon="el-icon-date"
-                style="width:200px"
-              />
-            </input-vue>
-          </div>
-        </div>
-      </div>
-      <div class="imgContent">
-        <div class="img-box">
-          <div class="img-item">
-            <div v-if="fileName" class="title-box">
-              <div class="img-title">
-                {{ fileName }}
-              </div>
-              <div class="img-btn">
-                <el-button type="text" class="btn">
-                  下载
-                </el-button>
-              </div>
-            </div>
-            <el-upload
-              class="avatar-uploader"
-              :headers="myHeaders"
-              action="http://111.198.10.15:21403/file/uploadFile"
-              :show-file-list="false"
-              :on-success="handleAvatarSuccess"
-              :before-upload="beforeAvatarUpload"
-            >
-              <img v-if="imageUrl" :src="imageUrl" class="avatar">
-              <i v-else class="el-icon-plus avatar-uploader-icon" />
-            </el-upload>
-          </div>
-          <div class="img-item">
-            <div v-if="fileName2" class="title-box">
-              <div class="img-title">
-                {{ fileName2 }}
-              </div>
-              <div class="img-btn">
-                <el-button type="text" class="btn">
-                  下载
-                </el-button>
-              </div>
-            </div>
-            <el-upload
-              class="avatar-uploader"
-              :headers="myHeaders"
-              action="http://111.198.10.15:21403/file/uploadFile"
-              :show-file-list="false"
-              :on-success="handleAvatarSuccess2"
-              :before-upload="beforeAvatarUpload"
-            >
-              <img v-if="imageUrl2" :src="imageUrl2" class="avatar">
-              <i v-else class="el-icon-plus avatar-uploader-icon" />
-            </el-upload>
-          </div>
-        </div>
-        <div class="uploadbtn">
-          <el-button type="primary">
-            上传录库评审结果
-          </el-button>
-        </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 { getToken } from '@/utils/auth'
-import { Message } from 'element-ui'
-import { evaluateAdd } from '../../../api/supplier/supplier'
-
-export default {
-  components: { inputVue, dialogHeader, RedStar },
-  props: {
-    dataInfo: {
-      type: Object,
-      dataInfo: {}
-    }
-  },
-  data() {
-    return {
-      isShowInfo: true,
-      fileName: '',
-      imageUrl: '',
-      imageUrl2: '',
-      fileName2: '',
-      myHeaders: { token: getToken() },
-      quarterOptions: [
-        { label: '2021第一季度', value: '2021第一季度' },
-        { label: '2021第二季度', value: '2021第二季度' }
-      ],
-      resultOptions: [
-        { label: 'A', value: 'A' },
-        { label: 'B', value: 'B' },
-        { label: 'C', value: 'C' }
-      ],
-      addInfo: {
-        supplierCode: '',
-        supplierName: '',
-        evaluateQuarterly: '',
-        quarterlyEvaluateResult: '',
-        quarterlyEvaluateIllustration: '',
-        quarterlyEvaluateDate: '',
-        quarterlyEvaluateFile: ''
-      }
-    }
-  },
-  watch: {
-    dataInfo: {
-      handler(val) {
-        console.log(val)
-        if (val != '') {
-          const temp = { ...this.addInfo }
-          this.addInfo = {
-            supplierCode: val.supplierCode,
-            supplierName: val.supplierName,
-            evaluateQuarterly: temp.evaluateQuarterly,
-            quarterlyEvaluateResult: temp.quarterlyEvaluateResult,
-            quarterlyEvaluateIllustration: temp.quarterlyEvaluateIllustration,
-            quarterlyEvaluateDate: temp.quarterlyEvaluateDate,
-            quarterlyEvaluateFile: temp.quarterlyEvaluateFile
-          }
-          console.log(this.addInfo)
-        }
-      },
-      deep: true,
-      immediate: true
-    }
-  },
-  methods: {
-    close() {
-      this.$emit('close')
-    },
-    // 照片上传
-    handleAvatarSuccess(res, file) {
-      this.fileName = res.data.fileName
-      console.log(res, file)
-      this.imageUrl = URL.createObjectURL(file.raw)
-      console.log(this.addInfo.quarterlyEvaluateFile, 'this.addInfo.quarterlyEvaluateFile')
-      if (this.addInfo.quarterlyEvaluateFile == '') {
-        console.log('1')
-        this.addInfo.quarterlyEvaluateFile = res.data.fileId
-      } else {
-        console.log('2')
-        this.addInfo.quarterlyEvaluateFile = this.addInfo.quarterlyEvaluateFile + ',' + res.data.fileId
-      }
-      console.log(this.addInfo.quarterlyEvaluateFile)
-    },
-    handleAvatarSuccess2(res, file) {
-      this.fileName2 = res.data.fileName
-      console.log(res, file)
-      this.imageUrl2 = URL.createObjectURL(file.raw)
-      if (this.addInfo.quarterlyEvaluateFile == '') {
-        console.log('3')
-        this.addInfo.quarterlyEvaluateFile = res.data.fileId
-      } else {
-        console.log('4')
-        this.addInfo.quarterlyEvaluateFile = this.addInfo.quarterlyEvaluateFile + ',' + res.data.fileId
-      }
-      console.log(this.addInfo.quarterlyEvaluateFile)
-    },
-    beforeAvatarUpload(file) {
-      const isJPG = file.type === 'image/jpeg'
-      const isLt2M = file.size / 1024 / 1024 < 2
-
-      if (!isJPG) {
-        this.$message.error('上传头像图片只能是 JPG 格式!')
-      }
-      if (!isLt2M) {
-        this.$message.error('上传头像图片大小不能超过 2MB!')
-      }
-      return isJPG && isLt2M
-    },
-    save() {
-      evaluateAdd(this.addInfo).then(res => {
-        console.log(res)
-        if (!res.code) {
-          this.close()
-          Message.success('保存成功')
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style lang='scss' scoped>
-.evaluateDialog {
-  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: 600px;
-      height: 250px;
-      display: flex;
-      justify-content: space-between;
-      padding: 10px 40px;
-      border: 1px solid #000;
-
-      .img-item {
-        width: 178px;
-        height: 200px;
-
-        .title-box {
-          display: flex;
-          justify-content: space-between;
-
-          .img-title {
-            width: 150px;
-            white-space: nowrap;
-            overflow: hidden;
-            text-overflow: ellipsis;
-            margin-right: 20px;
-          }
-
-          .img-btn {
-            .btn {
-              padding: 0;
-            }
-          }
-        }
-      }
-    }
-  }
-
-  .btnBox {
-    padding: 30px;
-    box-sizing: border-box;
-    display: flex;
-    align-items: center;
-    justify-content: space-evenly;
-
-    .save,
-    .close {
-      width: 100px;
-    }
-
-  }
-}
-
-.avatar-uploader .el-upload {
-  border: 1px dashed #d9d9d9;
-  border-radius: 6px;
-  cursor: pointer;
-  position: relative;
-  overflow: hidden;
-}
-
-.avatar-uploader .el-upload:hover {
-  border-color: #409EFF;
-}
-
-.avatar-uploader-icon {
-  font-size: 28px;
-  color: #8c939d;
-  width: 178px;
-  height: 178px;
-  line-height: 178px;
-  text-align: center;
-}
-
-.avatar {
-  width: 178px;
-  height: 178px;
-  display: block;
-}
-</style>

diff --git a/src/api/supplier/supplier.js b/src/api/supplier/supplier.js
index 0fd037c..fe31ad0 100644
--- a/src/api/supplier/supplier.js
+++ b/src/api/supplier/supplier.js
@@ -48,7 +48,7 @@
 
 // 新增
 const evaluateAdd = (data) => {
-  return instance.post('/supplierInputReview/add', data)
+  return instance.post('/supplierQuarterlyEvaluate/add', data)
 }
 
 // 年度考核不分页列表
diff --git a/src/components/mycomponent/dialog/assessDialog.vue b/src/components/mycomponent/dialog/assessDialog.vue
deleted file mode 100644
index 5bb387d..0000000
--- a/src/components/mycomponent/dialog/assessDialog.vue
+++ /dev/null
@@ -1,364 +0,0 @@
-<!--年度考核弹窗-->
-<template>
-  <el-dialog title="年度考核" width="975px" :visible.sync="isShowInfo" append-to-body @close="close">
-    <div class="assessDialog">
-      <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.assessAnnual" clearable placeholder="请选择" style="width:200px">
-                <el-option v-for="item in yearOptions" :key="item.value" :label="item.label" :value="item.value" />
-              </el-select>
-            </input-vue>
-          </div>
-          <div class="inputBox">
-            <input-vue
-              v-model="addInfo.annualAssessIllustration"
-              title="年度考核说明"
-              class="inputWidth"
-              placeholder="请输入年度考核说明"
-              width="200px"
-            />
-          </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">
-            <red-star />
-            <input-vue title="考核结果" class="inputWidth">
-              <el-select v-model="addInfo.annualAssessResult" clearable placeholder="请选择" style="width:200px">
-                <el-option v-for="item in resultOptions" :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.annualAssessDate"
-                placeholder="请选择日期"
-                suffix-icon="el-icon-date"
-                style="width:200px"
-              />
-            </input-vue>
-          </div>
-        </div>
-      </div>
-      <div class="imgContent">
-        <div class="img-box">
-          <div class="img-item">
-            <div v-if="fileName" class="title-box">
-              <div class="img-title">
-                {{ fileName }}
-              </div>
-              <div class="img-btn">
-                <el-button type="text" class="btn">
-                  下载
-                </el-button>
-              </div>
-            </div>
-            <el-upload
-              class="avatar-uploader"
-              :headers="myHeaders"
-              action="http://111.198.10.15:21403/file/uploadFile"
-              :show-file-list="false"
-              :on-success="handleAvatarSuccess"
-              :before-upload="beforeAvatarUpload"
-            >
-              <img v-if="imageUrl" :src="imageUrl" class="avatar">
-              <i v-else class="el-icon-plus avatar-uploader-icon" />
-            </el-upload>
-          </div>
-          <div class="img-item">
-            <div v-if="fileName2" class="title-box">
-              <div class="img-title">
-                {{ fileName2 }}
-              </div>
-              <div class="img-btn">
-                <el-button type="text" class="btn">
-                  下载
-                </el-button>
-              </div>
-            </div>
-            <el-upload
-              class="avatar-uploader"
-              :headers="myHeaders"
-              action="http://111.198.10.15:21403/file/uploadFile"
-              :show-file-list="false"
-              :on-success="handleAvatarSuccess2"
-              :before-upload="beforeAvatarUpload"
-            >
-              <img v-if="imageUrl2" :src="imageUrl2" class="avatar">
-              <i v-else class="el-icon-plus avatar-uploader-icon" />
-            </el-upload>
-          </div>
-        </div>
-        <div class="uploadbtn">
-          <el-button type="primary">
-            上传录库评审结果
-          </el-button>
-        </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 { getToken } from '@/utils/auth'
-import { Message } from 'element-ui'
-import { assessAdd } from '../../../api/supplier/supplier'
-export default {
-  components: { inputVue, dialogHeader, RedStar },
-  props: {
-    dataInfo: {
-      type: Object,
-      dataInfo: {}
-    }
-  },
-  data() {
-    return {
-      fileName: '',
-      imageUrl: '',
-      imageUrl2: '',
-      fileName2: '',
-      myHeaders: { token: getToken() },
-      isShowInfo: true,
-      yearOptions: [
-        { label: '2021', value: '2021' },
-        { label: '2022', value: '2022' }
-      ],
-      resultOptions: [
-        { label: 'A', value: 'A' },
-        { label: 'B', value: 'B' },
-        { label: 'C', value: 'C' }
-      ],
-      addInfo: {
-        supplierCode: '',
-        supplierName: '',
-        assessAnnual: '',
-        annualAssessResult: '',
-        annualAssessIllustration: '',
-        annualAssessDate: '',
-        annualAssessFile: ''
-      }
-    }
-  },
-  watch: {
-    dataInfo: {
-      handler(val) {
-        console.log(val)
-        if (val != '') {
-          const temp = { ...this.addInfo }
-          this.addInfo = {
-            supplierCode: val.supplierCode,
-            supplierName: val.supplierName,
-            assessAnnual: temp.assessAnnual,
-            annualAssessResult: temp.annualAssessResult,
-            annualAssessIllustration: temp.annualAssessIllustration,
-            annualAssessDate: temp.annualAssessDate,
-            annualAssessFile: temp.annualAssessFile
-          }
-          console.log(this.addInfo)
-        }
-      },
-      deep: true,
-      immediate: true
-    }
-  },
-  methods: {
-    close() {
-      this.$emit('close')
-    },
-    // 照片上传
-    handleAvatarSuccess(res, file) {
-      this.fileName = res.data.fileName
-      console.log(res, file)
-      this.imageUrl = URL.createObjectURL(file.raw)
-      console.log(this.addInfo.annualAssessFile, 'this.addInfo.annualAssessFile')
-      if (this.addInfo.annualAssessFile == '') {
-        console.log('1')
-        this.addInfo.annualAssessFile = res.data.fileId
-      } else {
-        console.log('2')
-        this.addInfo.annualAssessFile = this.addInfo.annualAssessFile + ',' + res.data.fileId
-      }
-      console.log(this.addInfo.annualAssessFile)
-    },
-    handleAvatarSuccess2(res, file) {
-      this.fileName2 = res.data.fileName
-      console.log(res, file)
-      this.imageUrl2 = URL.createObjectURL(file.raw)
-      if (this.addInfo.annualAssessFile == '') {
-        console.log('3')
-        this.addInfo.annualAssessFile = res.data.fileId
-      } else {
-        console.log('4')
-        this.addInfo.annualAssessFile = this.addInfo.annualAssessFile + ',' + res.data.fileId
-      }
-      console.log(this.addInfo.annualAssessFile)
-    },
-    beforeAvatarUpload(file) {
-      const isJPG = file.type === 'image/jpeg'
-      const isLt2M = file.size / 1024 / 1024 < 2
-
-      if (!isJPG) {
-        this.$message.error('上传头像图片只能是 JPG 格式!')
-      }
-      if (!isLt2M) {
-        this.$message.error('上传头像图片大小不能超过 2MB!')
-      }
-      return isJPG && isLt2M
-    },
-    save() {
-      assessAdd(this.addInfo).then(res => {
-        console.log(res)
-        if (!res.code) {
-          this.close()
-          Message.success('保存成功')
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style lang='scss' scoped>
-.assessDialog {
-  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: 600px;
-      height: 250px;
-      display: flex;
-      justify-content: space-between;
-      padding: 10px 40px;
-      border: 1px solid #000;
-
-      .img-item {
-        width: 178px;
-        height: 200px;
-
-        .title-box {
-          display: flex;
-          justify-content: space-between;
-
-          .img-title {
-            width: 150px;
-            white-space: nowrap;
-            overflow: hidden;
-            text-overflow: ellipsis;
-            margin-right: 20px;
-          }
-
-          .img-btn {
-            .btn {
-              padding: 0;
-            }
-          }
-        }
-      }
-    }
-  }
-
-  .btnBox {
-    padding: 30px;
-    box-sizing: border-box;
-    display: flex;
-    align-items: center;
-    justify-content: space-evenly;
-
-    .save,
-    .close {
-      width: 100px;
-    }
-
-  }
-}
-
-.avatar-uploader .el-upload {
-  border: 1px dashed #d9d9d9;
-  border-radius: 6px;
-  cursor: pointer;
-  position: relative;
-  overflow: hidden;
-}
-
-.avatar-uploader .el-upload:hover {
-  border-color: #409EFF;
-}
-
-.avatar-uploader-icon {
-  font-size: 28px;
-  color: #8c939d;
-  width: 178px;
-  height: 178px;
-  line-height: 178px;
-  text-align: center;
-}
-
-.avatar {
-  width: 178px;
-  height: 178px;
-  display: block;
-}
-</style>
diff --git a/src/components/mycomponent/dialog/evaluateDialog.vue b/src/components/mycomponent/dialog/evaluateDialog.vue
deleted file mode 100644
index ba3ad75..0000000
--- a/src/components/mycomponent/dialog/evaluateDialog.vue
+++ /dev/null
@@ -1,365 +0,0 @@
-<!--季度评价弹窗-->
-<template>
-  <el-dialog title="季度评价" width="975px" :visible.sync="isShowInfo" append-to-body @close="close">
-    <div class="evaluateDialog">
-      <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.evaluateQuarterly" clearable placeholder="请选择" style="width:200px">
-                <el-option v-for="item in quarterOptions" :key="item.value" :label="item.label" :value="item.value" />
-              </el-select>
-            </input-vue>
-          </div>
-          <div class="inputBox">
-            <input-vue
-              v-model="addInfo.quarterlyEvaluateIllustration"
-              title="季度评价说明"
-              class="inputWidth"
-              placeholder="请输入季度评价说明"
-              width="200px"
-            />
-          </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">
-            <red-star />
-            <input-vue title="季度评价结果" class="inputWidth">
-              <el-select v-model="addInfo.quarterlyEvaluateResult" clearable placeholder="请选择" style="width:200px">
-                <el-option v-for="item in resultOptions" :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.quarterlyEvaluateDate"
-                placeholder="请选择日期"
-                suffix-icon="el-icon-date"
-                style="width:200px"
-              />
-            </input-vue>
-          </div>
-        </div>
-      </div>
-      <div class="imgContent">
-        <div class="img-box">
-          <div class="img-item">
-            <div v-if="fileName" class="title-box">
-              <div class="img-title">
-                {{ fileName }}
-              </div>
-              <div class="img-btn">
-                <el-button type="text" class="btn">
-                  下载
-                </el-button>
-              </div>
-            </div>
-            <el-upload
-              class="avatar-uploader"
-              :headers="myHeaders"
-              action="http://111.198.10.15:21403/file/uploadFile"
-              :show-file-list="false"
-              :on-success="handleAvatarSuccess"
-              :before-upload="beforeAvatarUpload"
-            >
-              <img v-if="imageUrl" :src="imageUrl" class="avatar">
-              <i v-else class="el-icon-plus avatar-uploader-icon" />
-            </el-upload>
-          </div>
-          <div class="img-item">
-            <div v-if="fileName2" class="title-box">
-              <div class="img-title">
-                {{ fileName2 }}
-              </div>
-              <div class="img-btn">
-                <el-button type="text" class="btn">
-                  下载
-                </el-button>
-              </div>
-            </div>
-            <el-upload
-              class="avatar-uploader"
-              :headers="myHeaders"
-              action="http://111.198.10.15:21403/file/uploadFile"
-              :show-file-list="false"
-              :on-success="handleAvatarSuccess2"
-              :before-upload="beforeAvatarUpload"
-            >
-              <img v-if="imageUrl2" :src="imageUrl2" class="avatar">
-              <i v-else class="el-icon-plus avatar-uploader-icon" />
-            </el-upload>
-          </div>
-        </div>
-        <div class="uploadbtn">
-          <el-button type="primary">
-            上传录库评审结果
-          </el-button>
-        </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 { getToken } from '@/utils/auth'
-import { Message } from 'element-ui'
-import { evaluateAdd } from '../../../api/supplier/supplier'
-
-export default {
-  components: { inputVue, dialogHeader, RedStar },
-  props: {
-    dataInfo: {
-      type: Object,
-      dataInfo: {}
-    }
-  },
-  data() {
-    return {
-      isShowInfo: true,
-      fileName: '',
-      imageUrl: '',
-      imageUrl2: '',
-      fileName2: '',
-      myHeaders: { token: getToken() },
-      quarterOptions: [
-        { label: '2021第一季度', value: '2021第一季度' },
-        { label: '2021第二季度', value: '2021第二季度' }
-      ],
-      resultOptions: [
-        { label: 'A', value: 'A' },
-        { label: 'B', value: 'B' },
-        { label: 'C', value: 'C' }
-      ],
-      addInfo: {
-        supplierCode: '',
-        supplierName: '',
-        evaluateQuarterly: '',
-        quarterlyEvaluateResult: '',
-        quarterlyEvaluateIllustration: '',
-        quarterlyEvaluateDate: '',
-        quarterlyEvaluateFile: ''
-      }
-    }
-  },
-  watch: {
-    dataInfo: {
-      handler(val) {
-        console.log(val)
-        if (val != '') {
-          const temp = { ...this.addInfo }
-          this.addInfo = {
-            supplierCode: val.supplierCode,
-            supplierName: val.supplierName,
-            evaluateQuarterly: temp.evaluateQuarterly,
-            quarterlyEvaluateResult: temp.quarterlyEvaluateResult,
-            quarterlyEvaluateIllustration: temp.quarterlyEvaluateIllustration,
-            quarterlyEvaluateDate: temp.quarterlyEvaluateDate,
-            quarterlyEvaluateFile: temp.quarterlyEvaluateFile
-          }
-          console.log(this.addInfo)
-        }
-      },
-      deep: true,
-      immediate: true
-    }
-  },
-  methods: {
-    close() {
-      this.$emit('close')
-    },
-    // 照片上传
-    handleAvatarSuccess(res, file) {
-      this.fileName = res.data.fileName
-      console.log(res, file)
-      this.imageUrl = URL.createObjectURL(file.raw)
-      console.log(this.addInfo.quarterlyEvaluateFile, 'this.addInfo.quarterlyEvaluateFile')
-      if (this.addInfo.quarterlyEvaluateFile == '') {
-        console.log('1')
-        this.addInfo.quarterlyEvaluateFile = res.data.fileId
-      } else {
-        console.log('2')
-        this.addInfo.quarterlyEvaluateFile = this.addInfo.quarterlyEvaluateFile + ',' + res.data.fileId
-      }
-      console.log(this.addInfo.quarterlyEvaluateFile)
-    },
-    handleAvatarSuccess2(res, file) {
-      this.fileName2 = res.data.fileName
-      console.log(res, file)
-      this.imageUrl2 = URL.createObjectURL(file.raw)
-      if (this.addInfo.quarterlyEvaluateFile == '') {
-        console.log('3')
-        this.addInfo.quarterlyEvaluateFile = res.data.fileId
-      } else {
-        console.log('4')
-        this.addInfo.quarterlyEvaluateFile = this.addInfo.quarterlyEvaluateFile + ',' + res.data.fileId
-      }
-      console.log(this.addInfo.quarterlyEvaluateFile)
-    },
-    beforeAvatarUpload(file) {
-      const isJPG = file.type === 'image/jpeg'
-      const isLt2M = file.size / 1024 / 1024 < 2
-
-      if (!isJPG) {
-        this.$message.error('上传头像图片只能是 JPG 格式!')
-      }
-      if (!isLt2M) {
-        this.$message.error('上传头像图片大小不能超过 2MB!')
-      }
-      return isJPG && isLt2M
-    },
-    save() {
-      evaluateAdd(this.addInfo).then(res => {
-        console.log(res)
-        if (!res.code) {
-          this.close()
-          Message.success('保存成功')
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style lang='scss' scoped>
-.evaluateDialog {
-  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: 600px;
-      height: 250px;
-      display: flex;
-      justify-content: space-between;
-      padding: 10px 40px;
-      border: 1px solid #000;
-
-      .img-item {
-        width: 178px;
-        height: 200px;
-
-        .title-box {
-          display: flex;
-          justify-content: space-between;
-
-          .img-title {
-            width: 150px;
-            white-space: nowrap;
-            overflow: hidden;
-            text-overflow: ellipsis;
-            margin-right: 20px;
-          }
-
-          .img-btn {
-            .btn {
-              padding: 0;
-            }
-          }
-        }
-      }
-    }
-  }
-
-  .btnBox {
-    padding: 30px;
-    box-sizing: border-box;
-    display: flex;
-    align-items: center;
-    justify-content: space-evenly;
-
-    .save,
-    .close {
-      width: 100px;
-    }
-
-  }
-}
-
-.avatar-uploader .el-upload {
-  border: 1px dashed #d9d9d9;
-  border-radius: 6px;
-  cursor: pointer;
-  position: relative;
-  overflow: hidden;
-}
-
-.avatar-uploader .el-upload:hover {
-  border-color: #409EFF;
-}
-
-.avatar-uploader-icon {
-  font-size: 28px;
-  color: #8c939d;
-  width: 178px;
-  height: 178px;
-  line-height: 178px;
-  text-align: center;
-}
-
-.avatar {
-  width: 178px;
-  height: 178px;
-  display: block;
-}
-</style>
diff --git a/src/components/mycomponent/dialog/historyAssessDialog.vue b/src/components/mycomponent/dialog/historyAssessDialog.vue
deleted file mode 100644
index 30a0c57..0000000
--- a/src/components/mycomponent/dialog/historyAssessDialog.vue
+++ /dev/null
@@ -1,146 +0,0 @@
-<!--历史考核弹窗-->
-<template>
-  <div class="historyAssessDialog dialog">
-    <dialog-header title="历史考核" @close="close" />
-    <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="assessAnnualName" label="考核年度" width="150" />
-        <el-table-column prop="annualAssessResultName" label="年度考核结果" width="150" />
-        <el-table-column prop="annualAssessIllustration" label="年度考核说明" width="150" />
-        <el-table-column prop="annualAssessDate" label="年度考核时间" width="150" />
-        <el-table-column prop="annualAssessFile" 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>
-</template>
-
-<script>
-import dialogHeader from './dialogHeader.vue'
-import inputVue from '../input/inputVue.vue'
-import RedStar from '../redStar.vue'
-
-import { historyAssess } from '../../../api/supplier/supplier'
-
-export default {
-  components: { inputVue, dialogHeader, RedStar },
-  props: {
-    dataInfo: {
-      type: Object,
-      dataInfo: {}
-    }
-  },
-  data() {
-    return {
-      tableData: []
-    }
-  },
-  mounted() {
-    this.getHistoryAssess()
-  },
-  methods: {
-    // 生成序号
-    indexMethod(index) {
-      return index + 1
-    },
-    // 合并表头
-    headerStyle({ row, column, rowIndex, columnIndex }) {
-      row[5].colSpan = 2 // 第三列的表头占据2个单元格
-      row[6].colSpan = 0
-      if (columnIndex === 6) {
-        return 'display: none'
-      }
-    },
-    close() {
-      this.$emit('close')
-    },
-    getHistoryAssess() {
-      historyAssess().then(res => {
-        console.log(res)
-        this.tableData = res
-      })
-    }
-  }
-}
-</script>
-
-<style lang='scss' scoped>
-.historyAssessDialog {
-  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 {
-    margin: 20px;
-  }
-
-}
-</style>

diff --git a/src/api/supplier/supplier.js b/src/api/supplier/supplier.js
index 0fd037c..fe31ad0 100644
--- a/src/api/supplier/supplier.js
+++ b/src/api/supplier/supplier.js
@@ -48,7 +48,7 @@
 
 // 新增
 const evaluateAdd = (data) => {
-  return instance.post('/supplierInputReview/add', data)
+  return instance.post('/supplierQuarterlyEvaluate/add', data)
 }
 
 // 年度考核不分页列表
diff --git a/src/components/mycomponent/dialog/assessDialog.vue b/src/components/mycomponent/dialog/assessDialog.vue
deleted file mode 100644
index 5bb387d..0000000
--- a/src/components/mycomponent/dialog/assessDialog.vue
+++ /dev/null
@@ -1,364 +0,0 @@
-<!--年度考核弹窗-->
-<template>
-  <el-dialog title="年度考核" width="975px" :visible.sync="isShowInfo" append-to-body @close="close">
-    <div class="assessDialog">
-      <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.assessAnnual" clearable placeholder="请选择" style="width:200px">
-                <el-option v-for="item in yearOptions" :key="item.value" :label="item.label" :value="item.value" />
-              </el-select>
-            </input-vue>
-          </div>
-          <div class="inputBox">
-            <input-vue
-              v-model="addInfo.annualAssessIllustration"
-              title="年度考核说明"
-              class="inputWidth"
-              placeholder="请输入年度考核说明"
-              width="200px"
-            />
-          </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">
-            <red-star />
-            <input-vue title="考核结果" class="inputWidth">
-              <el-select v-model="addInfo.annualAssessResult" clearable placeholder="请选择" style="width:200px">
-                <el-option v-for="item in resultOptions" :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.annualAssessDate"
-                placeholder="请选择日期"
-                suffix-icon="el-icon-date"
-                style="width:200px"
-              />
-            </input-vue>
-          </div>
-        </div>
-      </div>
-      <div class="imgContent">
-        <div class="img-box">
-          <div class="img-item">
-            <div v-if="fileName" class="title-box">
-              <div class="img-title">
-                {{ fileName }}
-              </div>
-              <div class="img-btn">
-                <el-button type="text" class="btn">
-                  下载
-                </el-button>
-              </div>
-            </div>
-            <el-upload
-              class="avatar-uploader"
-              :headers="myHeaders"
-              action="http://111.198.10.15:21403/file/uploadFile"
-              :show-file-list="false"
-              :on-success="handleAvatarSuccess"
-              :before-upload="beforeAvatarUpload"
-            >
-              <img v-if="imageUrl" :src="imageUrl" class="avatar">
-              <i v-else class="el-icon-plus avatar-uploader-icon" />
-            </el-upload>
-          </div>
-          <div class="img-item">
-            <div v-if="fileName2" class="title-box">
-              <div class="img-title">
-                {{ fileName2 }}
-              </div>
-              <div class="img-btn">
-                <el-button type="text" class="btn">
-                  下载
-                </el-button>
-              </div>
-            </div>
-            <el-upload
-              class="avatar-uploader"
-              :headers="myHeaders"
-              action="http://111.198.10.15:21403/file/uploadFile"
-              :show-file-list="false"
-              :on-success="handleAvatarSuccess2"
-              :before-upload="beforeAvatarUpload"
-            >
-              <img v-if="imageUrl2" :src="imageUrl2" class="avatar">
-              <i v-else class="el-icon-plus avatar-uploader-icon" />
-            </el-upload>
-          </div>
-        </div>
-        <div class="uploadbtn">
-          <el-button type="primary">
-            上传录库评审结果
-          </el-button>
-        </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 { getToken } from '@/utils/auth'
-import { Message } from 'element-ui'
-import { assessAdd } from '../../../api/supplier/supplier'
-export default {
-  components: { inputVue, dialogHeader, RedStar },
-  props: {
-    dataInfo: {
-      type: Object,
-      dataInfo: {}
-    }
-  },
-  data() {
-    return {
-      fileName: '',
-      imageUrl: '',
-      imageUrl2: '',
-      fileName2: '',
-      myHeaders: { token: getToken() },
-      isShowInfo: true,
-      yearOptions: [
-        { label: '2021', value: '2021' },
-        { label: '2022', value: '2022' }
-      ],
-      resultOptions: [
-        { label: 'A', value: 'A' },
-        { label: 'B', value: 'B' },
-        { label: 'C', value: 'C' }
-      ],
-      addInfo: {
-        supplierCode: '',
-        supplierName: '',
-        assessAnnual: '',
-        annualAssessResult: '',
-        annualAssessIllustration: '',
-        annualAssessDate: '',
-        annualAssessFile: ''
-      }
-    }
-  },
-  watch: {
-    dataInfo: {
-      handler(val) {
-        console.log(val)
-        if (val != '') {
-          const temp = { ...this.addInfo }
-          this.addInfo = {
-            supplierCode: val.supplierCode,
-            supplierName: val.supplierName,
-            assessAnnual: temp.assessAnnual,
-            annualAssessResult: temp.annualAssessResult,
-            annualAssessIllustration: temp.annualAssessIllustration,
-            annualAssessDate: temp.annualAssessDate,
-            annualAssessFile: temp.annualAssessFile
-          }
-          console.log(this.addInfo)
-        }
-      },
-      deep: true,
-      immediate: true
-    }
-  },
-  methods: {
-    close() {
-      this.$emit('close')
-    },
-    // 照片上传
-    handleAvatarSuccess(res, file) {
-      this.fileName = res.data.fileName
-      console.log(res, file)
-      this.imageUrl = URL.createObjectURL(file.raw)
-      console.log(this.addInfo.annualAssessFile, 'this.addInfo.annualAssessFile')
-      if (this.addInfo.annualAssessFile == '') {
-        console.log('1')
-        this.addInfo.annualAssessFile = res.data.fileId
-      } else {
-        console.log('2')
-        this.addInfo.annualAssessFile = this.addInfo.annualAssessFile + ',' + res.data.fileId
-      }
-      console.log(this.addInfo.annualAssessFile)
-    },
-    handleAvatarSuccess2(res, file) {
-      this.fileName2 = res.data.fileName
-      console.log(res, file)
-      this.imageUrl2 = URL.createObjectURL(file.raw)
-      if (this.addInfo.annualAssessFile == '') {
-        console.log('3')
-        this.addInfo.annualAssessFile = res.data.fileId
-      } else {
-        console.log('4')
-        this.addInfo.annualAssessFile = this.addInfo.annualAssessFile + ',' + res.data.fileId
-      }
-      console.log(this.addInfo.annualAssessFile)
-    },
-    beforeAvatarUpload(file) {
-      const isJPG = file.type === 'image/jpeg'
-      const isLt2M = file.size / 1024 / 1024 < 2
-
-      if (!isJPG) {
-        this.$message.error('上传头像图片只能是 JPG 格式!')
-      }
-      if (!isLt2M) {
-        this.$message.error('上传头像图片大小不能超过 2MB!')
-      }
-      return isJPG && isLt2M
-    },
-    save() {
-      assessAdd(this.addInfo).then(res => {
-        console.log(res)
-        if (!res.code) {
-          this.close()
-          Message.success('保存成功')
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style lang='scss' scoped>
-.assessDialog {
-  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: 600px;
-      height: 250px;
-      display: flex;
-      justify-content: space-between;
-      padding: 10px 40px;
-      border: 1px solid #000;
-
-      .img-item {
-        width: 178px;
-        height: 200px;
-
-        .title-box {
-          display: flex;
-          justify-content: space-between;
-
-          .img-title {
-            width: 150px;
-            white-space: nowrap;
-            overflow: hidden;
-            text-overflow: ellipsis;
-            margin-right: 20px;
-          }
-
-          .img-btn {
-            .btn {
-              padding: 0;
-            }
-          }
-        }
-      }
-    }
-  }
-
-  .btnBox {
-    padding: 30px;
-    box-sizing: border-box;
-    display: flex;
-    align-items: center;
-    justify-content: space-evenly;
-
-    .save,
-    .close {
-      width: 100px;
-    }
-
-  }
-}
-
-.avatar-uploader .el-upload {
-  border: 1px dashed #d9d9d9;
-  border-radius: 6px;
-  cursor: pointer;
-  position: relative;
-  overflow: hidden;
-}
-
-.avatar-uploader .el-upload:hover {
-  border-color: #409EFF;
-}
-
-.avatar-uploader-icon {
-  font-size: 28px;
-  color: #8c939d;
-  width: 178px;
-  height: 178px;
-  line-height: 178px;
-  text-align: center;
-}
-
-.avatar {
-  width: 178px;
-  height: 178px;
-  display: block;
-}
-</style>
diff --git a/src/components/mycomponent/dialog/evaluateDialog.vue b/src/components/mycomponent/dialog/evaluateDialog.vue
deleted file mode 100644
index ba3ad75..0000000
--- a/src/components/mycomponent/dialog/evaluateDialog.vue
+++ /dev/null
@@ -1,365 +0,0 @@
-<!--季度评价弹窗-->
-<template>
-  <el-dialog title="季度评价" width="975px" :visible.sync="isShowInfo" append-to-body @close="close">
-    <div class="evaluateDialog">
-      <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.evaluateQuarterly" clearable placeholder="请选择" style="width:200px">
-                <el-option v-for="item in quarterOptions" :key="item.value" :label="item.label" :value="item.value" />
-              </el-select>
-            </input-vue>
-          </div>
-          <div class="inputBox">
-            <input-vue
-              v-model="addInfo.quarterlyEvaluateIllustration"
-              title="季度评价说明"
-              class="inputWidth"
-              placeholder="请输入季度评价说明"
-              width="200px"
-            />
-          </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">
-            <red-star />
-            <input-vue title="季度评价结果" class="inputWidth">
-              <el-select v-model="addInfo.quarterlyEvaluateResult" clearable placeholder="请选择" style="width:200px">
-                <el-option v-for="item in resultOptions" :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.quarterlyEvaluateDate"
-                placeholder="请选择日期"
-                suffix-icon="el-icon-date"
-                style="width:200px"
-              />
-            </input-vue>
-          </div>
-        </div>
-      </div>
-      <div class="imgContent">
-        <div class="img-box">
-          <div class="img-item">
-            <div v-if="fileName" class="title-box">
-              <div class="img-title">
-                {{ fileName }}
-              </div>
-              <div class="img-btn">
-                <el-button type="text" class="btn">
-                  下载
-                </el-button>
-              </div>
-            </div>
-            <el-upload
-              class="avatar-uploader"
-              :headers="myHeaders"
-              action="http://111.198.10.15:21403/file/uploadFile"
-              :show-file-list="false"
-              :on-success="handleAvatarSuccess"
-              :before-upload="beforeAvatarUpload"
-            >
-              <img v-if="imageUrl" :src="imageUrl" class="avatar">
-              <i v-else class="el-icon-plus avatar-uploader-icon" />
-            </el-upload>
-          </div>
-          <div class="img-item">
-            <div v-if="fileName2" class="title-box">
-              <div class="img-title">
-                {{ fileName2 }}
-              </div>
-              <div class="img-btn">
-                <el-button type="text" class="btn">
-                  下载
-                </el-button>
-              </div>
-            </div>
-            <el-upload
-              class="avatar-uploader"
-              :headers="myHeaders"
-              action="http://111.198.10.15:21403/file/uploadFile"
-              :show-file-list="false"
-              :on-success="handleAvatarSuccess2"
-              :before-upload="beforeAvatarUpload"
-            >
-              <img v-if="imageUrl2" :src="imageUrl2" class="avatar">
-              <i v-else class="el-icon-plus avatar-uploader-icon" />
-            </el-upload>
-          </div>
-        </div>
-        <div class="uploadbtn">
-          <el-button type="primary">
-            上传录库评审结果
-          </el-button>
-        </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 { getToken } from '@/utils/auth'
-import { Message } from 'element-ui'
-import { evaluateAdd } from '../../../api/supplier/supplier'
-
-export default {
-  components: { inputVue, dialogHeader, RedStar },
-  props: {
-    dataInfo: {
-      type: Object,
-      dataInfo: {}
-    }
-  },
-  data() {
-    return {
-      isShowInfo: true,
-      fileName: '',
-      imageUrl: '',
-      imageUrl2: '',
-      fileName2: '',
-      myHeaders: { token: getToken() },
-      quarterOptions: [
-        { label: '2021第一季度', value: '2021第一季度' },
-        { label: '2021第二季度', value: '2021第二季度' }
-      ],
-      resultOptions: [
-        { label: 'A', value: 'A' },
-        { label: 'B', value: 'B' },
-        { label: 'C', value: 'C' }
-      ],
-      addInfo: {
-        supplierCode: '',
-        supplierName: '',
-        evaluateQuarterly: '',
-        quarterlyEvaluateResult: '',
-        quarterlyEvaluateIllustration: '',
-        quarterlyEvaluateDate: '',
-        quarterlyEvaluateFile: ''
-      }
-    }
-  },
-  watch: {
-    dataInfo: {
-      handler(val) {
-        console.log(val)
-        if (val != '') {
-          const temp = { ...this.addInfo }
-          this.addInfo = {
-            supplierCode: val.supplierCode,
-            supplierName: val.supplierName,
-            evaluateQuarterly: temp.evaluateQuarterly,
-            quarterlyEvaluateResult: temp.quarterlyEvaluateResult,
-            quarterlyEvaluateIllustration: temp.quarterlyEvaluateIllustration,
-            quarterlyEvaluateDate: temp.quarterlyEvaluateDate,
-            quarterlyEvaluateFile: temp.quarterlyEvaluateFile
-          }
-          console.log(this.addInfo)
-        }
-      },
-      deep: true,
-      immediate: true
-    }
-  },
-  methods: {
-    close() {
-      this.$emit('close')
-    },
-    // 照片上传
-    handleAvatarSuccess(res, file) {
-      this.fileName = res.data.fileName
-      console.log(res, file)
-      this.imageUrl = URL.createObjectURL(file.raw)
-      console.log(this.addInfo.quarterlyEvaluateFile, 'this.addInfo.quarterlyEvaluateFile')
-      if (this.addInfo.quarterlyEvaluateFile == '') {
-        console.log('1')
-        this.addInfo.quarterlyEvaluateFile = res.data.fileId
-      } else {
-        console.log('2')
-        this.addInfo.quarterlyEvaluateFile = this.addInfo.quarterlyEvaluateFile + ',' + res.data.fileId
-      }
-      console.log(this.addInfo.quarterlyEvaluateFile)
-    },
-    handleAvatarSuccess2(res, file) {
-      this.fileName2 = res.data.fileName
-      console.log(res, file)
-      this.imageUrl2 = URL.createObjectURL(file.raw)
-      if (this.addInfo.quarterlyEvaluateFile == '') {
-        console.log('3')
-        this.addInfo.quarterlyEvaluateFile = res.data.fileId
-      } else {
-        console.log('4')
-        this.addInfo.quarterlyEvaluateFile = this.addInfo.quarterlyEvaluateFile + ',' + res.data.fileId
-      }
-      console.log(this.addInfo.quarterlyEvaluateFile)
-    },
-    beforeAvatarUpload(file) {
-      const isJPG = file.type === 'image/jpeg'
-      const isLt2M = file.size / 1024 / 1024 < 2
-
-      if (!isJPG) {
-        this.$message.error('上传头像图片只能是 JPG 格式!')
-      }
-      if (!isLt2M) {
-        this.$message.error('上传头像图片大小不能超过 2MB!')
-      }
-      return isJPG && isLt2M
-    },
-    save() {
-      evaluateAdd(this.addInfo).then(res => {
-        console.log(res)
-        if (!res.code) {
-          this.close()
-          Message.success('保存成功')
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style lang='scss' scoped>
-.evaluateDialog {
-  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: 600px;
-      height: 250px;
-      display: flex;
-      justify-content: space-between;
-      padding: 10px 40px;
-      border: 1px solid #000;
-
-      .img-item {
-        width: 178px;
-        height: 200px;
-
-        .title-box {
-          display: flex;
-          justify-content: space-between;
-
-          .img-title {
-            width: 150px;
-            white-space: nowrap;
-            overflow: hidden;
-            text-overflow: ellipsis;
-            margin-right: 20px;
-          }
-
-          .img-btn {
-            .btn {
-              padding: 0;
-            }
-          }
-        }
-      }
-    }
-  }
-
-  .btnBox {
-    padding: 30px;
-    box-sizing: border-box;
-    display: flex;
-    align-items: center;
-    justify-content: space-evenly;
-
-    .save,
-    .close {
-      width: 100px;
-    }
-
-  }
-}
-
-.avatar-uploader .el-upload {
-  border: 1px dashed #d9d9d9;
-  border-radius: 6px;
-  cursor: pointer;
-  position: relative;
-  overflow: hidden;
-}
-
-.avatar-uploader .el-upload:hover {
-  border-color: #409EFF;
-}
-
-.avatar-uploader-icon {
-  font-size: 28px;
-  color: #8c939d;
-  width: 178px;
-  height: 178px;
-  line-height: 178px;
-  text-align: center;
-}
-
-.avatar {
-  width: 178px;
-  height: 178px;
-  display: block;
-}
-</style>
diff --git a/src/components/mycomponent/dialog/historyAssessDialog.vue b/src/components/mycomponent/dialog/historyAssessDialog.vue
deleted file mode 100644
index 30a0c57..0000000
--- a/src/components/mycomponent/dialog/historyAssessDialog.vue
+++ /dev/null
@@ -1,146 +0,0 @@
-<!--历史考核弹窗-->
-<template>
-  <div class="historyAssessDialog dialog">
-    <dialog-header title="历史考核" @close="close" />
-    <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="assessAnnualName" label="考核年度" width="150" />
-        <el-table-column prop="annualAssessResultName" label="年度考核结果" width="150" />
-        <el-table-column prop="annualAssessIllustration" label="年度考核说明" width="150" />
-        <el-table-column prop="annualAssessDate" label="年度考核时间" width="150" />
-        <el-table-column prop="annualAssessFile" 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>
-</template>
-
-<script>
-import dialogHeader from './dialogHeader.vue'
-import inputVue from '../input/inputVue.vue'
-import RedStar from '../redStar.vue'
-
-import { historyAssess } from '../../../api/supplier/supplier'
-
-export default {
-  components: { inputVue, dialogHeader, RedStar },
-  props: {
-    dataInfo: {
-      type: Object,
-      dataInfo: {}
-    }
-  },
-  data() {
-    return {
-      tableData: []
-    }
-  },
-  mounted() {
-    this.getHistoryAssess()
-  },
-  methods: {
-    // 生成序号
-    indexMethod(index) {
-      return index + 1
-    },
-    // 合并表头
-    headerStyle({ row, column, rowIndex, columnIndex }) {
-      row[5].colSpan = 2 // 第三列的表头占据2个单元格
-      row[6].colSpan = 0
-      if (columnIndex === 6) {
-        return 'display: none'
-      }
-    },
-    close() {
-      this.$emit('close')
-    },
-    getHistoryAssess() {
-      historyAssess().then(res => {
-        console.log(res)
-        this.tableData = res
-      })
-    }
-  }
-}
-</script>
-
-<style lang='scss' scoped>
-.historyAssessDialog {
-  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 {
-    margin: 20px;
-  }
-
-}
-</style>
diff --git a/src/components/mycomponent/dialog/historyEvaluateDialog.vue b/src/components/mycomponent/dialog/historyEvaluateDialog.vue
deleted file mode 100644
index 8fce92f..0000000
--- a/src/components/mycomponent/dialog/historyEvaluateDialog.vue
+++ /dev/null
@@ -1,148 +0,0 @@
-<!--历史评价弹窗-->
-<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>
-</template>
-
-<script>
-import dialogHeader from './dialogHeader.vue'
-import inputVue from '../input/inputVue.vue'
-import RedStar from '../redStar.vue'
-
-import { historyEvaluate } from '../../../api/supplier/supplier'
-
-export default {
-  components: { inputVue, dialogHeader, RedStar },
-  props: {
-    dataInfo: {
-      type: Object,
-      dataInfo: {}
-    }
-  },
-  data() {
-    return {
-      isShowInfo: true,
-      tableData: []
-    }
-  },
-  mounted() {
-    this.getHistoryEvaluate()
-  },
-  methods: {
-    // 生成序号
-    indexMethod(index) {
-      return index + 1
-    },
-    // 合并表头
-    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)
-        this.tableData = res
-      })
-    }
-  }
-}
-</script>
-
-<style lang='scss' scoped>
-.historyEvaluateDialog {
-  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 {
-        display: flex;
-        justify-content: inherit;
-        align-items: center;
-      }
-    }
-
-  }
-
-  .Dialog-table {
-    margin: 20px;
-  }
-
-}
-</style>

diff --git a/src/api/supplier/supplier.js b/src/api/supplier/supplier.js
index 0fd037c..fe31ad0 100644
--- a/src/api/supplier/supplier.js
+++ b/src/api/supplier/supplier.js
@@ -48,7 +48,7 @@
 
 // 新增
 const evaluateAdd = (data) => {
-  return instance.post('/supplierInputReview/add', data)
+  return instance.post('/supplierQuarterlyEvaluate/add', data)
 }
 
 // 年度考核不分页列表
diff --git a/src/components/mycomponent/dialog/assessDialog.vue b/src/components/mycomponent/dialog/assessDialog.vue
deleted file mode 100644
index 5bb387d..0000000
--- a/src/components/mycomponent/dialog/assessDialog.vue
+++ /dev/null
@@ -1,364 +0,0 @@
-<!--年度考核弹窗-->
-<template>
-  <el-dialog title="年度考核" width="975px" :visible.sync="isShowInfo" append-to-body @close="close">
-    <div class="assessDialog">
-      <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.assessAnnual" clearable placeholder="请选择" style="width:200px">
-                <el-option v-for="item in yearOptions" :key="item.value" :label="item.label" :value="item.value" />
-              </el-select>
-            </input-vue>
-          </div>
-          <div class="inputBox">
-            <input-vue
-              v-model="addInfo.annualAssessIllustration"
-              title="年度考核说明"
-              class="inputWidth"
-              placeholder="请输入年度考核说明"
-              width="200px"
-            />
-          </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">
-            <red-star />
-            <input-vue title="考核结果" class="inputWidth">
-              <el-select v-model="addInfo.annualAssessResult" clearable placeholder="请选择" style="width:200px">
-                <el-option v-for="item in resultOptions" :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.annualAssessDate"
-                placeholder="请选择日期"
-                suffix-icon="el-icon-date"
-                style="width:200px"
-              />
-            </input-vue>
-          </div>
-        </div>
-      </div>
-      <div class="imgContent">
-        <div class="img-box">
-          <div class="img-item">
-            <div v-if="fileName" class="title-box">
-              <div class="img-title">
-                {{ fileName }}
-              </div>
-              <div class="img-btn">
-                <el-button type="text" class="btn">
-                  下载
-                </el-button>
-              </div>
-            </div>
-            <el-upload
-              class="avatar-uploader"
-              :headers="myHeaders"
-              action="http://111.198.10.15:21403/file/uploadFile"
-              :show-file-list="false"
-              :on-success="handleAvatarSuccess"
-              :before-upload="beforeAvatarUpload"
-            >
-              <img v-if="imageUrl" :src="imageUrl" class="avatar">
-              <i v-else class="el-icon-plus avatar-uploader-icon" />
-            </el-upload>
-          </div>
-          <div class="img-item">
-            <div v-if="fileName2" class="title-box">
-              <div class="img-title">
-                {{ fileName2 }}
-              </div>
-              <div class="img-btn">
-                <el-button type="text" class="btn">
-                  下载
-                </el-button>
-              </div>
-            </div>
-            <el-upload
-              class="avatar-uploader"
-              :headers="myHeaders"
-              action="http://111.198.10.15:21403/file/uploadFile"
-              :show-file-list="false"
-              :on-success="handleAvatarSuccess2"
-              :before-upload="beforeAvatarUpload"
-            >
-              <img v-if="imageUrl2" :src="imageUrl2" class="avatar">
-              <i v-else class="el-icon-plus avatar-uploader-icon" />
-            </el-upload>
-          </div>
-        </div>
-        <div class="uploadbtn">
-          <el-button type="primary">
-            上传录库评审结果
-          </el-button>
-        </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 { getToken } from '@/utils/auth'
-import { Message } from 'element-ui'
-import { assessAdd } from '../../../api/supplier/supplier'
-export default {
-  components: { inputVue, dialogHeader, RedStar },
-  props: {
-    dataInfo: {
-      type: Object,
-      dataInfo: {}
-    }
-  },
-  data() {
-    return {
-      fileName: '',
-      imageUrl: '',
-      imageUrl2: '',
-      fileName2: '',
-      myHeaders: { token: getToken() },
-      isShowInfo: true,
-      yearOptions: [
-        { label: '2021', value: '2021' },
-        { label: '2022', value: '2022' }
-      ],
-      resultOptions: [
-        { label: 'A', value: 'A' },
-        { label: 'B', value: 'B' },
-        { label: 'C', value: 'C' }
-      ],
-      addInfo: {
-        supplierCode: '',
-        supplierName: '',
-        assessAnnual: '',
-        annualAssessResult: '',
-        annualAssessIllustration: '',
-        annualAssessDate: '',
-        annualAssessFile: ''
-      }
-    }
-  },
-  watch: {
-    dataInfo: {
-      handler(val) {
-        console.log(val)
-        if (val != '') {
-          const temp = { ...this.addInfo }
-          this.addInfo = {
-            supplierCode: val.supplierCode,
-            supplierName: val.supplierName,
-            assessAnnual: temp.assessAnnual,
-            annualAssessResult: temp.annualAssessResult,
-            annualAssessIllustration: temp.annualAssessIllustration,
-            annualAssessDate: temp.annualAssessDate,
-            annualAssessFile: temp.annualAssessFile
-          }
-          console.log(this.addInfo)
-        }
-      },
-      deep: true,
-      immediate: true
-    }
-  },
-  methods: {
-    close() {
-      this.$emit('close')
-    },
-    // 照片上传
-    handleAvatarSuccess(res, file) {
-      this.fileName = res.data.fileName
-      console.log(res, file)
-      this.imageUrl = URL.createObjectURL(file.raw)
-      console.log(this.addInfo.annualAssessFile, 'this.addInfo.annualAssessFile')
-      if (this.addInfo.annualAssessFile == '') {
-        console.log('1')
-        this.addInfo.annualAssessFile = res.data.fileId
-      } else {
-        console.log('2')
-        this.addInfo.annualAssessFile = this.addInfo.annualAssessFile + ',' + res.data.fileId
-      }
-      console.log(this.addInfo.annualAssessFile)
-    },
-    handleAvatarSuccess2(res, file) {
-      this.fileName2 = res.data.fileName
-      console.log(res, file)
-      this.imageUrl2 = URL.createObjectURL(file.raw)
-      if (this.addInfo.annualAssessFile == '') {
-        console.log('3')
-        this.addInfo.annualAssessFile = res.data.fileId
-      } else {
-        console.log('4')
-        this.addInfo.annualAssessFile = this.addInfo.annualAssessFile + ',' + res.data.fileId
-      }
-      console.log(this.addInfo.annualAssessFile)
-    },
-    beforeAvatarUpload(file) {
-      const isJPG = file.type === 'image/jpeg'
-      const isLt2M = file.size / 1024 / 1024 < 2
-
-      if (!isJPG) {
-        this.$message.error('上传头像图片只能是 JPG 格式!')
-      }
-      if (!isLt2M) {
-        this.$message.error('上传头像图片大小不能超过 2MB!')
-      }
-      return isJPG && isLt2M
-    },
-    save() {
-      assessAdd(this.addInfo).then(res => {
-        console.log(res)
-        if (!res.code) {
-          this.close()
-          Message.success('保存成功')
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style lang='scss' scoped>
-.assessDialog {
-  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: 600px;
-      height: 250px;
-      display: flex;
-      justify-content: space-between;
-      padding: 10px 40px;
-      border: 1px solid #000;
-
-      .img-item {
-        width: 178px;
-        height: 200px;
-
-        .title-box {
-          display: flex;
-          justify-content: space-between;
-
-          .img-title {
-            width: 150px;
-            white-space: nowrap;
-            overflow: hidden;
-            text-overflow: ellipsis;
-            margin-right: 20px;
-          }
-
-          .img-btn {
-            .btn {
-              padding: 0;
-            }
-          }
-        }
-      }
-    }
-  }
-
-  .btnBox {
-    padding: 30px;
-    box-sizing: border-box;
-    display: flex;
-    align-items: center;
-    justify-content: space-evenly;
-
-    .save,
-    .close {
-      width: 100px;
-    }
-
-  }
-}
-
-.avatar-uploader .el-upload {
-  border: 1px dashed #d9d9d9;
-  border-radius: 6px;
-  cursor: pointer;
-  position: relative;
-  overflow: hidden;
-}
-
-.avatar-uploader .el-upload:hover {
-  border-color: #409EFF;
-}
-
-.avatar-uploader-icon {
-  font-size: 28px;
-  color: #8c939d;
-  width: 178px;
-  height: 178px;
-  line-height: 178px;
-  text-align: center;
-}
-
-.avatar {
-  width: 178px;
-  height: 178px;
-  display: block;
-}
-</style>
diff --git a/src/components/mycomponent/dialog/evaluateDialog.vue b/src/components/mycomponent/dialog/evaluateDialog.vue
deleted file mode 100644
index ba3ad75..0000000
--- a/src/components/mycomponent/dialog/evaluateDialog.vue
+++ /dev/null
@@ -1,365 +0,0 @@
-<!--季度评价弹窗-->
-<template>
-  <el-dialog title="季度评价" width="975px" :visible.sync="isShowInfo" append-to-body @close="close">
-    <div class="evaluateDialog">
-      <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.evaluateQuarterly" clearable placeholder="请选择" style="width:200px">
-                <el-option v-for="item in quarterOptions" :key="item.value" :label="item.label" :value="item.value" />
-              </el-select>
-            </input-vue>
-          </div>
-          <div class="inputBox">
-            <input-vue
-              v-model="addInfo.quarterlyEvaluateIllustration"
-              title="季度评价说明"
-              class="inputWidth"
-              placeholder="请输入季度评价说明"
-              width="200px"
-            />
-          </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">
-            <red-star />
-            <input-vue title="季度评价结果" class="inputWidth">
-              <el-select v-model="addInfo.quarterlyEvaluateResult" clearable placeholder="请选择" style="width:200px">
-                <el-option v-for="item in resultOptions" :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.quarterlyEvaluateDate"
-                placeholder="请选择日期"
-                suffix-icon="el-icon-date"
-                style="width:200px"
-              />
-            </input-vue>
-          </div>
-        </div>
-      </div>
-      <div class="imgContent">
-        <div class="img-box">
-          <div class="img-item">
-            <div v-if="fileName" class="title-box">
-              <div class="img-title">
-                {{ fileName }}
-              </div>
-              <div class="img-btn">
-                <el-button type="text" class="btn">
-                  下载
-                </el-button>
-              </div>
-            </div>
-            <el-upload
-              class="avatar-uploader"
-              :headers="myHeaders"
-              action="http://111.198.10.15:21403/file/uploadFile"
-              :show-file-list="false"
-              :on-success="handleAvatarSuccess"
-              :before-upload="beforeAvatarUpload"
-            >
-              <img v-if="imageUrl" :src="imageUrl" class="avatar">
-              <i v-else class="el-icon-plus avatar-uploader-icon" />
-            </el-upload>
-          </div>
-          <div class="img-item">
-            <div v-if="fileName2" class="title-box">
-              <div class="img-title">
-                {{ fileName2 }}
-              </div>
-              <div class="img-btn">
-                <el-button type="text" class="btn">
-                  下载
-                </el-button>
-              </div>
-            </div>
-            <el-upload
-              class="avatar-uploader"
-              :headers="myHeaders"
-              action="http://111.198.10.15:21403/file/uploadFile"
-              :show-file-list="false"
-              :on-success="handleAvatarSuccess2"
-              :before-upload="beforeAvatarUpload"
-            >
-              <img v-if="imageUrl2" :src="imageUrl2" class="avatar">
-              <i v-else class="el-icon-plus avatar-uploader-icon" />
-            </el-upload>
-          </div>
-        </div>
-        <div class="uploadbtn">
-          <el-button type="primary">
-            上传录库评审结果
-          </el-button>
-        </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 { getToken } from '@/utils/auth'
-import { Message } from 'element-ui'
-import { evaluateAdd } from '../../../api/supplier/supplier'
-
-export default {
-  components: { inputVue, dialogHeader, RedStar },
-  props: {
-    dataInfo: {
-      type: Object,
-      dataInfo: {}
-    }
-  },
-  data() {
-    return {
-      isShowInfo: true,
-      fileName: '',
-      imageUrl: '',
-      imageUrl2: '',
-      fileName2: '',
-      myHeaders: { token: getToken() },
-      quarterOptions: [
-        { label: '2021第一季度', value: '2021第一季度' },
-        { label: '2021第二季度', value: '2021第二季度' }
-      ],
-      resultOptions: [
-        { label: 'A', value: 'A' },
-        { label: 'B', value: 'B' },
-        { label: 'C', value: 'C' }
-      ],
-      addInfo: {
-        supplierCode: '',
-        supplierName: '',
-        evaluateQuarterly: '',
-        quarterlyEvaluateResult: '',
-        quarterlyEvaluateIllustration: '',
-        quarterlyEvaluateDate: '',
-        quarterlyEvaluateFile: ''
-      }
-    }
-  },
-  watch: {
-    dataInfo: {
-      handler(val) {
-        console.log(val)
-        if (val != '') {
-          const temp = { ...this.addInfo }
-          this.addInfo = {
-            supplierCode: val.supplierCode,
-            supplierName: val.supplierName,
-            evaluateQuarterly: temp.evaluateQuarterly,
-            quarterlyEvaluateResult: temp.quarterlyEvaluateResult,
-            quarterlyEvaluateIllustration: temp.quarterlyEvaluateIllustration,
-            quarterlyEvaluateDate: temp.quarterlyEvaluateDate,
-            quarterlyEvaluateFile: temp.quarterlyEvaluateFile
-          }
-          console.log(this.addInfo)
-        }
-      },
-      deep: true,
-      immediate: true
-    }
-  },
-  methods: {
-    close() {
-      this.$emit('close')
-    },
-    // 照片上传
-    handleAvatarSuccess(res, file) {
-      this.fileName = res.data.fileName
-      console.log(res, file)
-      this.imageUrl = URL.createObjectURL(file.raw)
-      console.log(this.addInfo.quarterlyEvaluateFile, 'this.addInfo.quarterlyEvaluateFile')
-      if (this.addInfo.quarterlyEvaluateFile == '') {
-        console.log('1')
-        this.addInfo.quarterlyEvaluateFile = res.data.fileId
-      } else {
-        console.log('2')
-        this.addInfo.quarterlyEvaluateFile = this.addInfo.quarterlyEvaluateFile + ',' + res.data.fileId
-      }
-      console.log(this.addInfo.quarterlyEvaluateFile)
-    },
-    handleAvatarSuccess2(res, file) {
-      this.fileName2 = res.data.fileName
-      console.log(res, file)
-      this.imageUrl2 = URL.createObjectURL(file.raw)
-      if (this.addInfo.quarterlyEvaluateFile == '') {
-        console.log('3')
-        this.addInfo.quarterlyEvaluateFile = res.data.fileId
-      } else {
-        console.log('4')
-        this.addInfo.quarterlyEvaluateFile = this.addInfo.quarterlyEvaluateFile + ',' + res.data.fileId
-      }
-      console.log(this.addInfo.quarterlyEvaluateFile)
-    },
-    beforeAvatarUpload(file) {
-      const isJPG = file.type === 'image/jpeg'
-      const isLt2M = file.size / 1024 / 1024 < 2
-
-      if (!isJPG) {
-        this.$message.error('上传头像图片只能是 JPG 格式!')
-      }
-      if (!isLt2M) {
-        this.$message.error('上传头像图片大小不能超过 2MB!')
-      }
-      return isJPG && isLt2M
-    },
-    save() {
-      evaluateAdd(this.addInfo).then(res => {
-        console.log(res)
-        if (!res.code) {
-          this.close()
-          Message.success('保存成功')
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style lang='scss' scoped>
-.evaluateDialog {
-  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: 600px;
-      height: 250px;
-      display: flex;
-      justify-content: space-between;
-      padding: 10px 40px;
-      border: 1px solid #000;
-
-      .img-item {
-        width: 178px;
-        height: 200px;
-
-        .title-box {
-          display: flex;
-          justify-content: space-between;
-
-          .img-title {
-            width: 150px;
-            white-space: nowrap;
-            overflow: hidden;
-            text-overflow: ellipsis;
-            margin-right: 20px;
-          }
-
-          .img-btn {
-            .btn {
-              padding: 0;
-            }
-          }
-        }
-      }
-    }
-  }
-
-  .btnBox {
-    padding: 30px;
-    box-sizing: border-box;
-    display: flex;
-    align-items: center;
-    justify-content: space-evenly;
-
-    .save,
-    .close {
-      width: 100px;
-    }
-
-  }
-}
-
-.avatar-uploader .el-upload {
-  border: 1px dashed #d9d9d9;
-  border-radius: 6px;
-  cursor: pointer;
-  position: relative;
-  overflow: hidden;
-}
-
-.avatar-uploader .el-upload:hover {
-  border-color: #409EFF;
-}
-
-.avatar-uploader-icon {
-  font-size: 28px;
-  color: #8c939d;
-  width: 178px;
-  height: 178px;
-  line-height: 178px;
-  text-align: center;
-}
-
-.avatar {
-  width: 178px;
-  height: 178px;
-  display: block;
-}
-</style>
diff --git a/src/components/mycomponent/dialog/historyAssessDialog.vue b/src/components/mycomponent/dialog/historyAssessDialog.vue
deleted file mode 100644
index 30a0c57..0000000
--- a/src/components/mycomponent/dialog/historyAssessDialog.vue
+++ /dev/null
@@ -1,146 +0,0 @@
-<!--历史考核弹窗-->
-<template>
-  <div class="historyAssessDialog dialog">
-    <dialog-header title="历史考核" @close="close" />
-    <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="assessAnnualName" label="考核年度" width="150" />
-        <el-table-column prop="annualAssessResultName" label="年度考核结果" width="150" />
-        <el-table-column prop="annualAssessIllustration" label="年度考核说明" width="150" />
-        <el-table-column prop="annualAssessDate" label="年度考核时间" width="150" />
-        <el-table-column prop="annualAssessFile" 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>
-</template>
-
-<script>
-import dialogHeader from './dialogHeader.vue'
-import inputVue from '../input/inputVue.vue'
-import RedStar from '../redStar.vue'
-
-import { historyAssess } from '../../../api/supplier/supplier'
-
-export default {
-  components: { inputVue, dialogHeader, RedStar },
-  props: {
-    dataInfo: {
-      type: Object,
-      dataInfo: {}
-    }
-  },
-  data() {
-    return {
-      tableData: []
-    }
-  },
-  mounted() {
-    this.getHistoryAssess()
-  },
-  methods: {
-    // 生成序号
-    indexMethod(index) {
-      return index + 1
-    },
-    // 合并表头
-    headerStyle({ row, column, rowIndex, columnIndex }) {
-      row[5].colSpan = 2 // 第三列的表头占据2个单元格
-      row[6].colSpan = 0
-      if (columnIndex === 6) {
-        return 'display: none'
-      }
-    },
-    close() {
-      this.$emit('close')
-    },
-    getHistoryAssess() {
-      historyAssess().then(res => {
-        console.log(res)
-        this.tableData = res
-      })
-    }
-  }
-}
-</script>
-
-<style lang='scss' scoped>
-.historyAssessDialog {
-  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 {
-    margin: 20px;
-  }
-
-}
-</style>
diff --git a/src/components/mycomponent/dialog/historyEvaluateDialog.vue b/src/components/mycomponent/dialog/historyEvaluateDialog.vue
deleted file mode 100644
index 8fce92f..0000000
--- a/src/components/mycomponent/dialog/historyEvaluateDialog.vue
+++ /dev/null
@@ -1,148 +0,0 @@
-<!--历史评价弹窗-->
-<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>
-</template>
-
-<script>
-import dialogHeader from './dialogHeader.vue'
-import inputVue from '../input/inputVue.vue'
-import RedStar from '../redStar.vue'
-
-import { historyEvaluate } from '../../../api/supplier/supplier'
-
-export default {
-  components: { inputVue, dialogHeader, RedStar },
-  props: {
-    dataInfo: {
-      type: Object,
-      dataInfo: {}
-    }
-  },
-  data() {
-    return {
-      isShowInfo: true,
-      tableData: []
-    }
-  },
-  mounted() {
-    this.getHistoryEvaluate()
-  },
-  methods: {
-    // 生成序号
-    indexMethod(index) {
-      return index + 1
-    },
-    // 合并表头
-    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)
-        this.tableData = res
-      })
-    }
-  }
-}
-</script>
-
-<style lang='scss' scoped>
-.historyEvaluateDialog {
-  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 {
-        display: flex;
-        justify-content: inherit;
-        align-items: center;
-      }
-    }
-
-  }
-
-  .Dialog-table {
-    margin: 20px;
-  }
-
-}
-</style>
diff --git a/src/views/supplier/assess.vue b/src/views/supplier/assess.vue
index 5315ce9..aa1b324 100644
--- a/src/views/supplier/assess.vue
+++ b/src/views/supplier/assess.vue
@@ -86,8 +86,8 @@
 
 <script>
 import GroupPage from '../../components/mycomponent/groupPage.vue'
-import assessDialog from '../../components/mycomponent/dialog/assessDialog.vue'
-import historyAssessDialog from '../../components/mycomponent/dialog/historyAssessDialog.vue'
+import assessDialog from './assessDialog.vue'
+import historyAssessDialog from './historyAssessDialog.vue'
 
 import { a_list } from '../../api/supplier/supplier'
 import { tableRowClassName } from '../../utils/myUtils/changeTableTr'

diff --git a/src/api/supplier/supplier.js b/src/api/supplier/supplier.js
index 0fd037c..fe31ad0 100644
--- a/src/api/supplier/supplier.js
+++ b/src/api/supplier/supplier.js
@@ -48,7 +48,7 @@
 
 // 新增
 const evaluateAdd = (data) => {
-  return instance.post('/supplierInputReview/add', data)
+  return instance.post('/supplierQuarterlyEvaluate/add', data)
 }
 
 // 年度考核不分页列表
diff --git a/src/components/mycomponent/dialog/assessDialog.vue b/src/components/mycomponent/dialog/assessDialog.vue
deleted file mode 100644
index 5bb387d..0000000
--- a/src/components/mycomponent/dialog/assessDialog.vue
+++ /dev/null
@@ -1,364 +0,0 @@
-<!--年度考核弹窗-->
-<template>
-  <el-dialog title="年度考核" width="975px" :visible.sync="isShowInfo" append-to-body @close="close">
-    <div class="assessDialog">
-      <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.assessAnnual" clearable placeholder="请选择" style="width:200px">
-                <el-option v-for="item in yearOptions" :key="item.value" :label="item.label" :value="item.value" />
-              </el-select>
-            </input-vue>
-          </div>
-          <div class="inputBox">
-            <input-vue
-              v-model="addInfo.annualAssessIllustration"
-              title="年度考核说明"
-              class="inputWidth"
-              placeholder="请输入年度考核说明"
-              width="200px"
-            />
-          </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">
-            <red-star />
-            <input-vue title="考核结果" class="inputWidth">
-              <el-select v-model="addInfo.annualAssessResult" clearable placeholder="请选择" style="width:200px">
-                <el-option v-for="item in resultOptions" :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.annualAssessDate"
-                placeholder="请选择日期"
-                suffix-icon="el-icon-date"
-                style="width:200px"
-              />
-            </input-vue>
-          </div>
-        </div>
-      </div>
-      <div class="imgContent">
-        <div class="img-box">
-          <div class="img-item">
-            <div v-if="fileName" class="title-box">
-              <div class="img-title">
-                {{ fileName }}
-              </div>
-              <div class="img-btn">
-                <el-button type="text" class="btn">
-                  下载
-                </el-button>
-              </div>
-            </div>
-            <el-upload
-              class="avatar-uploader"
-              :headers="myHeaders"
-              action="http://111.198.10.15:21403/file/uploadFile"
-              :show-file-list="false"
-              :on-success="handleAvatarSuccess"
-              :before-upload="beforeAvatarUpload"
-            >
-              <img v-if="imageUrl" :src="imageUrl" class="avatar">
-              <i v-else class="el-icon-plus avatar-uploader-icon" />
-            </el-upload>
-          </div>
-          <div class="img-item">
-            <div v-if="fileName2" class="title-box">
-              <div class="img-title">
-                {{ fileName2 }}
-              </div>
-              <div class="img-btn">
-                <el-button type="text" class="btn">
-                  下载
-                </el-button>
-              </div>
-            </div>
-            <el-upload
-              class="avatar-uploader"
-              :headers="myHeaders"
-              action="http://111.198.10.15:21403/file/uploadFile"
-              :show-file-list="false"
-              :on-success="handleAvatarSuccess2"
-              :before-upload="beforeAvatarUpload"
-            >
-              <img v-if="imageUrl2" :src="imageUrl2" class="avatar">
-              <i v-else class="el-icon-plus avatar-uploader-icon" />
-            </el-upload>
-          </div>
-        </div>
-        <div class="uploadbtn">
-          <el-button type="primary">
-            上传录库评审结果
-          </el-button>
-        </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 { getToken } from '@/utils/auth'
-import { Message } from 'element-ui'
-import { assessAdd } from '../../../api/supplier/supplier'
-export default {
-  components: { inputVue, dialogHeader, RedStar },
-  props: {
-    dataInfo: {
-      type: Object,
-      dataInfo: {}
-    }
-  },
-  data() {
-    return {
-      fileName: '',
-      imageUrl: '',
-      imageUrl2: '',
-      fileName2: '',
-      myHeaders: { token: getToken() },
-      isShowInfo: true,
-      yearOptions: [
-        { label: '2021', value: '2021' },
-        { label: '2022', value: '2022' }
-      ],
-      resultOptions: [
-        { label: 'A', value: 'A' },
-        { label: 'B', value: 'B' },
-        { label: 'C', value: 'C' }
-      ],
-      addInfo: {
-        supplierCode: '',
-        supplierName: '',
-        assessAnnual: '',
-        annualAssessResult: '',
-        annualAssessIllustration: '',
-        annualAssessDate: '',
-        annualAssessFile: ''
-      }
-    }
-  },
-  watch: {
-    dataInfo: {
-      handler(val) {
-        console.log(val)
-        if (val != '') {
-          const temp = { ...this.addInfo }
-          this.addInfo = {
-            supplierCode: val.supplierCode,
-            supplierName: val.supplierName,
-            assessAnnual: temp.assessAnnual,
-            annualAssessResult: temp.annualAssessResult,
-            annualAssessIllustration: temp.annualAssessIllustration,
-            annualAssessDate: temp.annualAssessDate,
-            annualAssessFile: temp.annualAssessFile
-          }
-          console.log(this.addInfo)
-        }
-      },
-      deep: true,
-      immediate: true
-    }
-  },
-  methods: {
-    close() {
-      this.$emit('close')
-    },
-    // 照片上传
-    handleAvatarSuccess(res, file) {
-      this.fileName = res.data.fileName
-      console.log(res, file)
-      this.imageUrl = URL.createObjectURL(file.raw)
-      console.log(this.addInfo.annualAssessFile, 'this.addInfo.annualAssessFile')
-      if (this.addInfo.annualAssessFile == '') {
-        console.log('1')
-        this.addInfo.annualAssessFile = res.data.fileId
-      } else {
-        console.log('2')
-        this.addInfo.annualAssessFile = this.addInfo.annualAssessFile + ',' + res.data.fileId
-      }
-      console.log(this.addInfo.annualAssessFile)
-    },
-    handleAvatarSuccess2(res, file) {
-      this.fileName2 = res.data.fileName
-      console.log(res, file)
-      this.imageUrl2 = URL.createObjectURL(file.raw)
-      if (this.addInfo.annualAssessFile == '') {
-        console.log('3')
-        this.addInfo.annualAssessFile = res.data.fileId
-      } else {
-        console.log('4')
-        this.addInfo.annualAssessFile = this.addInfo.annualAssessFile + ',' + res.data.fileId
-      }
-      console.log(this.addInfo.annualAssessFile)
-    },
-    beforeAvatarUpload(file) {
-      const isJPG = file.type === 'image/jpeg'
-      const isLt2M = file.size / 1024 / 1024 < 2
-
-      if (!isJPG) {
-        this.$message.error('上传头像图片只能是 JPG 格式!')
-      }
-      if (!isLt2M) {
-        this.$message.error('上传头像图片大小不能超过 2MB!')
-      }
-      return isJPG && isLt2M
-    },
-    save() {
-      assessAdd(this.addInfo).then(res => {
-        console.log(res)
-        if (!res.code) {
-          this.close()
-          Message.success('保存成功')
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style lang='scss' scoped>
-.assessDialog {
-  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: 600px;
-      height: 250px;
-      display: flex;
-      justify-content: space-between;
-      padding: 10px 40px;
-      border: 1px solid #000;
-
-      .img-item {
-        width: 178px;
-        height: 200px;
-
-        .title-box {
-          display: flex;
-          justify-content: space-between;
-
-          .img-title {
-            width: 150px;
-            white-space: nowrap;
-            overflow: hidden;
-            text-overflow: ellipsis;
-            margin-right: 20px;
-          }
-
-          .img-btn {
-            .btn {
-              padding: 0;
-            }
-          }
-        }
-      }
-    }
-  }
-
-  .btnBox {
-    padding: 30px;
-    box-sizing: border-box;
-    display: flex;
-    align-items: center;
-    justify-content: space-evenly;
-
-    .save,
-    .close {
-      width: 100px;
-    }
-
-  }
-}
-
-.avatar-uploader .el-upload {
-  border: 1px dashed #d9d9d9;
-  border-radius: 6px;
-  cursor: pointer;
-  position: relative;
-  overflow: hidden;
-}
-
-.avatar-uploader .el-upload:hover {
-  border-color: #409EFF;
-}
-
-.avatar-uploader-icon {
-  font-size: 28px;
-  color: #8c939d;
-  width: 178px;
-  height: 178px;
-  line-height: 178px;
-  text-align: center;
-}
-
-.avatar {
-  width: 178px;
-  height: 178px;
-  display: block;
-}
-</style>
diff --git a/src/components/mycomponent/dialog/evaluateDialog.vue b/src/components/mycomponent/dialog/evaluateDialog.vue
deleted file mode 100644
index ba3ad75..0000000
--- a/src/components/mycomponent/dialog/evaluateDialog.vue
+++ /dev/null
@@ -1,365 +0,0 @@
-<!--季度评价弹窗-->
-<template>
-  <el-dialog title="季度评价" width="975px" :visible.sync="isShowInfo" append-to-body @close="close">
-    <div class="evaluateDialog">
-      <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.evaluateQuarterly" clearable placeholder="请选择" style="width:200px">
-                <el-option v-for="item in quarterOptions" :key="item.value" :label="item.label" :value="item.value" />
-              </el-select>
-            </input-vue>
-          </div>
-          <div class="inputBox">
-            <input-vue
-              v-model="addInfo.quarterlyEvaluateIllustration"
-              title="季度评价说明"
-              class="inputWidth"
-              placeholder="请输入季度评价说明"
-              width="200px"
-            />
-          </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">
-            <red-star />
-            <input-vue title="季度评价结果" class="inputWidth">
-              <el-select v-model="addInfo.quarterlyEvaluateResult" clearable placeholder="请选择" style="width:200px">
-                <el-option v-for="item in resultOptions" :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.quarterlyEvaluateDate"
-                placeholder="请选择日期"
-                suffix-icon="el-icon-date"
-                style="width:200px"
-              />
-            </input-vue>
-          </div>
-        </div>
-      </div>
-      <div class="imgContent">
-        <div class="img-box">
-          <div class="img-item">
-            <div v-if="fileName" class="title-box">
-              <div class="img-title">
-                {{ fileName }}
-              </div>
-              <div class="img-btn">
-                <el-button type="text" class="btn">
-                  下载
-                </el-button>
-              </div>
-            </div>
-            <el-upload
-              class="avatar-uploader"
-              :headers="myHeaders"
-              action="http://111.198.10.15:21403/file/uploadFile"
-              :show-file-list="false"
-              :on-success="handleAvatarSuccess"
-              :before-upload="beforeAvatarUpload"
-            >
-              <img v-if="imageUrl" :src="imageUrl" class="avatar">
-              <i v-else class="el-icon-plus avatar-uploader-icon" />
-            </el-upload>
-          </div>
-          <div class="img-item">
-            <div v-if="fileName2" class="title-box">
-              <div class="img-title">
-                {{ fileName2 }}
-              </div>
-              <div class="img-btn">
-                <el-button type="text" class="btn">
-                  下载
-                </el-button>
-              </div>
-            </div>
-            <el-upload
-              class="avatar-uploader"
-              :headers="myHeaders"
-              action="http://111.198.10.15:21403/file/uploadFile"
-              :show-file-list="false"
-              :on-success="handleAvatarSuccess2"
-              :before-upload="beforeAvatarUpload"
-            >
-              <img v-if="imageUrl2" :src="imageUrl2" class="avatar">
-              <i v-else class="el-icon-plus avatar-uploader-icon" />
-            </el-upload>
-          </div>
-        </div>
-        <div class="uploadbtn">
-          <el-button type="primary">
-            上传录库评审结果
-          </el-button>
-        </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 { getToken } from '@/utils/auth'
-import { Message } from 'element-ui'
-import { evaluateAdd } from '../../../api/supplier/supplier'
-
-export default {
-  components: { inputVue, dialogHeader, RedStar },
-  props: {
-    dataInfo: {
-      type: Object,
-      dataInfo: {}
-    }
-  },
-  data() {
-    return {
-      isShowInfo: true,
-      fileName: '',
-      imageUrl: '',
-      imageUrl2: '',
-      fileName2: '',
-      myHeaders: { token: getToken() },
-      quarterOptions: [
-        { label: '2021第一季度', value: '2021第一季度' },
-        { label: '2021第二季度', value: '2021第二季度' }
-      ],
-      resultOptions: [
-        { label: 'A', value: 'A' },
-        { label: 'B', value: 'B' },
-        { label: 'C', value: 'C' }
-      ],
-      addInfo: {
-        supplierCode: '',
-        supplierName: '',
-        evaluateQuarterly: '',
-        quarterlyEvaluateResult: '',
-        quarterlyEvaluateIllustration: '',
-        quarterlyEvaluateDate: '',
-        quarterlyEvaluateFile: ''
-      }
-    }
-  },
-  watch: {
-    dataInfo: {
-      handler(val) {
-        console.log(val)
-        if (val != '') {
-          const temp = { ...this.addInfo }
-          this.addInfo = {
-            supplierCode: val.supplierCode,
-            supplierName: val.supplierName,
-            evaluateQuarterly: temp.evaluateQuarterly,
-            quarterlyEvaluateResult: temp.quarterlyEvaluateResult,
-            quarterlyEvaluateIllustration: temp.quarterlyEvaluateIllustration,
-            quarterlyEvaluateDate: temp.quarterlyEvaluateDate,
-            quarterlyEvaluateFile: temp.quarterlyEvaluateFile
-          }
-          console.log(this.addInfo)
-        }
-      },
-      deep: true,
-      immediate: true
-    }
-  },
-  methods: {
-    close() {
-      this.$emit('close')
-    },
-    // 照片上传
-    handleAvatarSuccess(res, file) {
-      this.fileName = res.data.fileName
-      console.log(res, file)
-      this.imageUrl = URL.createObjectURL(file.raw)
-      console.log(this.addInfo.quarterlyEvaluateFile, 'this.addInfo.quarterlyEvaluateFile')
-      if (this.addInfo.quarterlyEvaluateFile == '') {
-        console.log('1')
-        this.addInfo.quarterlyEvaluateFile = res.data.fileId
-      } else {
-        console.log('2')
-        this.addInfo.quarterlyEvaluateFile = this.addInfo.quarterlyEvaluateFile + ',' + res.data.fileId
-      }
-      console.log(this.addInfo.quarterlyEvaluateFile)
-    },
-    handleAvatarSuccess2(res, file) {
-      this.fileName2 = res.data.fileName
-      console.log(res, file)
-      this.imageUrl2 = URL.createObjectURL(file.raw)
-      if (this.addInfo.quarterlyEvaluateFile == '') {
-        console.log('3')
-        this.addInfo.quarterlyEvaluateFile = res.data.fileId
-      } else {
-        console.log('4')
-        this.addInfo.quarterlyEvaluateFile = this.addInfo.quarterlyEvaluateFile + ',' + res.data.fileId
-      }
-      console.log(this.addInfo.quarterlyEvaluateFile)
-    },
-    beforeAvatarUpload(file) {
-      const isJPG = file.type === 'image/jpeg'
-      const isLt2M = file.size / 1024 / 1024 < 2
-
-      if (!isJPG) {
-        this.$message.error('上传头像图片只能是 JPG 格式!')
-      }
-      if (!isLt2M) {
-        this.$message.error('上传头像图片大小不能超过 2MB!')
-      }
-      return isJPG && isLt2M
-    },
-    save() {
-      evaluateAdd(this.addInfo).then(res => {
-        console.log(res)
-        if (!res.code) {
-          this.close()
-          Message.success('保存成功')
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style lang='scss' scoped>
-.evaluateDialog {
-  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: 600px;
-      height: 250px;
-      display: flex;
-      justify-content: space-between;
-      padding: 10px 40px;
-      border: 1px solid #000;
-
-      .img-item {
-        width: 178px;
-        height: 200px;
-
-        .title-box {
-          display: flex;
-          justify-content: space-between;
-
-          .img-title {
-            width: 150px;
-            white-space: nowrap;
-            overflow: hidden;
-            text-overflow: ellipsis;
-            margin-right: 20px;
-          }
-
-          .img-btn {
-            .btn {
-              padding: 0;
-            }
-          }
-        }
-      }
-    }
-  }
-
-  .btnBox {
-    padding: 30px;
-    box-sizing: border-box;
-    display: flex;
-    align-items: center;
-    justify-content: space-evenly;
-
-    .save,
-    .close {
-      width: 100px;
-    }
-
-  }
-}
-
-.avatar-uploader .el-upload {
-  border: 1px dashed #d9d9d9;
-  border-radius: 6px;
-  cursor: pointer;
-  position: relative;
-  overflow: hidden;
-}
-
-.avatar-uploader .el-upload:hover {
-  border-color: #409EFF;
-}
-
-.avatar-uploader-icon {
-  font-size: 28px;
-  color: #8c939d;
-  width: 178px;
-  height: 178px;
-  line-height: 178px;
-  text-align: center;
-}
-
-.avatar {
-  width: 178px;
-  height: 178px;
-  display: block;
-}
-</style>
diff --git a/src/components/mycomponent/dialog/historyAssessDialog.vue b/src/components/mycomponent/dialog/historyAssessDialog.vue
deleted file mode 100644
index 30a0c57..0000000
--- a/src/components/mycomponent/dialog/historyAssessDialog.vue
+++ /dev/null
@@ -1,146 +0,0 @@
-<!--历史考核弹窗-->
-<template>
-  <div class="historyAssessDialog dialog">
-    <dialog-header title="历史考核" @close="close" />
-    <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="assessAnnualName" label="考核年度" width="150" />
-        <el-table-column prop="annualAssessResultName" label="年度考核结果" width="150" />
-        <el-table-column prop="annualAssessIllustration" label="年度考核说明" width="150" />
-        <el-table-column prop="annualAssessDate" label="年度考核时间" width="150" />
-        <el-table-column prop="annualAssessFile" 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>
-</template>
-
-<script>
-import dialogHeader from './dialogHeader.vue'
-import inputVue from '../input/inputVue.vue'
-import RedStar from '../redStar.vue'
-
-import { historyAssess } from '../../../api/supplier/supplier'
-
-export default {
-  components: { inputVue, dialogHeader, RedStar },
-  props: {
-    dataInfo: {
-      type: Object,
-      dataInfo: {}
-    }
-  },
-  data() {
-    return {
-      tableData: []
-    }
-  },
-  mounted() {
-    this.getHistoryAssess()
-  },
-  methods: {
-    // 生成序号
-    indexMethod(index) {
-      return index + 1
-    },
-    // 合并表头
-    headerStyle({ row, column, rowIndex, columnIndex }) {
-      row[5].colSpan = 2 // 第三列的表头占据2个单元格
-      row[6].colSpan = 0
-      if (columnIndex === 6) {
-        return 'display: none'
-      }
-    },
-    close() {
-      this.$emit('close')
-    },
-    getHistoryAssess() {
-      historyAssess().then(res => {
-        console.log(res)
-        this.tableData = res
-      })
-    }
-  }
-}
-</script>
-
-<style lang='scss' scoped>
-.historyAssessDialog {
-  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 {
-    margin: 20px;
-  }
-
-}
-</style>
diff --git a/src/components/mycomponent/dialog/historyEvaluateDialog.vue b/src/components/mycomponent/dialog/historyEvaluateDialog.vue
deleted file mode 100644
index 8fce92f..0000000
--- a/src/components/mycomponent/dialog/historyEvaluateDialog.vue
+++ /dev/null
@@ -1,148 +0,0 @@
-<!--历史评价弹窗-->
-<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>
-</template>
-
-<script>
-import dialogHeader from './dialogHeader.vue'
-import inputVue from '../input/inputVue.vue'
-import RedStar from '../redStar.vue'
-
-import { historyEvaluate } from '../../../api/supplier/supplier'
-
-export default {
-  components: { inputVue, dialogHeader, RedStar },
-  props: {
-    dataInfo: {
-      type: Object,
-      dataInfo: {}
-    }
-  },
-  data() {
-    return {
-      isShowInfo: true,
-      tableData: []
-    }
-  },
-  mounted() {
-    this.getHistoryEvaluate()
-  },
-  methods: {
-    // 生成序号
-    indexMethod(index) {
-      return index + 1
-    },
-    // 合并表头
-    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)
-        this.tableData = res
-      })
-    }
-  }
-}
-</script>
-
-<style lang='scss' scoped>
-.historyEvaluateDialog {
-  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 {
-        display: flex;
-        justify-content: inherit;
-        align-items: center;
-      }
-    }
-
-  }
-
-  .Dialog-table {
-    margin: 20px;
-  }
-
-}
-</style>
diff --git a/src/views/supplier/assess.vue b/src/views/supplier/assess.vue
index 5315ce9..aa1b324 100644
--- a/src/views/supplier/assess.vue
+++ b/src/views/supplier/assess.vue
@@ -86,8 +86,8 @@
 
 <script>
 import GroupPage from '../../components/mycomponent/groupPage.vue'
-import assessDialog from '../../components/mycomponent/dialog/assessDialog.vue'
-import historyAssessDialog from '../../components/mycomponent/dialog/historyAssessDialog.vue'
+import assessDialog from './assessDialog.vue'
+import historyAssessDialog from './historyAssessDialog.vue'
 
 import { a_list } from '../../api/supplier/supplier'
 import { tableRowClassName } from '../../utils/myUtils/changeTableTr'
diff --git a/src/views/supplier/assessDialog.vue b/src/views/supplier/assessDialog.vue
new file mode 100644
index 0000000..fd4bc00
--- /dev/null
+++ b/src/views/supplier/assessDialog.vue
@@ -0,0 +1,368 @@
+<!--年度考核弹窗-->
+<template>
+  <el-dialog title="年度考核" width="975px" :visible.sync="isShowInfo" append-to-body @close="close">
+    <div class="assessDialog">
+      <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.assessAnnual" clearable placeholder="请选择" style="width:200px">
+                <el-option v-for="item in yearOptions" :key="item.value" :label="item.label" :value="item.value" />
+              </el-select>
+            </input-vue>
+          </div>
+          <div class="inputBox">
+            <input-vue
+              v-model="addInfo.annualAssessIllustration"
+              title="年度考核说明"
+              class="inputWidth"
+              placeholder="请输入年度考核说明"
+              width="200px"
+            />
+          </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">
+            <red-star />
+            <input-vue title="考核结果" class="inputWidth">
+              <el-select v-model="addInfo.annualAssessResult" clearable placeholder="请选择" style="width:200px">
+                <el-option v-for="item in resultOptions" :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.annualAssessDate"
+                placeholder="请选择日期"
+                suffix-icon="el-icon-date"
+                style="width:200px"
+              />
+            </input-vue>
+          </div>
+        </div>
+      </div>
+      <div class="imgContent">
+        <div class="img-box">
+          <div class="img-item">
+            <div v-if="fileName" class="title-box">
+              <div class="img-title">
+                {{ fileName }}
+              </div>
+              <div class="img-btn">
+                <el-button type="text" class="btn">
+                  下载
+                </el-button>
+              </div>
+            </div>
+            <el-upload
+              class="avatar-uploader"
+              :headers="myHeaders"
+              action="http://111.198.10.15:21403/file/uploadFile"
+              :show-file-list="false"
+              :on-success="handleAvatarSuccess"
+              :before-upload="beforeAvatarUpload"
+            >
+              <img v-if="imageUrl" :src="imageUrl" class="avatar">
+              <i v-else class="el-icon-plus avatar-uploader-icon" />
+            </el-upload>
+          </div>
+          <div class="img-item">
+            <div v-if="fileName2" class="title-box">
+              <div class="img-title">
+                {{ fileName2 }}
+              </div>
+              <div class="img-btn">
+                <el-button type="text" class="btn">
+                  下载
+                </el-button>
+              </div>
+            </div>
+            <el-upload
+              class="avatar-uploader"
+              :headers="myHeaders"
+              action="http://111.198.10.15:21403/file/uploadFile"
+              :show-file-list="false"
+              :on-success="handleAvatarSuccess2"
+              :before-upload="beforeAvatarUpload"
+            >
+              <img v-if="imageUrl2" :src="imageUrl2" class="avatar">
+              <i v-else class="el-icon-plus avatar-uploader-icon" />
+            </el-upload>
+          </div>
+        </div>
+        <div class="uploadbtn">
+          <el-button type="primary">
+            上传录库评审结果
+          </el-button>
+        </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 '../../components/mycomponent/dialog/dialogHeader.vue'
+import inputVue from '../../components/mycomponent/input/inputVue.vue'
+import RedStar from '../../components/mycomponent/redStar.vue'
+
+import { getToken } from '@/utils/auth'
+import { Message } from 'element-ui'
+import { assessAdd } from '../../api/supplier/supplier'
+export default {
+  name: 'AssessDialog',
+  components: { inputVue, dialogHeader, RedStar },
+  props: {
+    assessAnnualOpts: {
+      type: Array,
+      default() {
+        return []
+      },
+      required: true
+    }
+  },
+  data() {
+    return {
+      fileName: '',
+      imageUrl: '',
+      imageUrl2: '',
+      fileName2: '',
+      myHeaders: { token: getToken() },
+      isShowInfo: true,
+      yearOptions: [
+        { label: '2021', value: '2021' },
+        { label: '2022', value: '2022' }
+      ],
+      resultOptions: [
+        { label: 'A', value: 'A' },
+        { label: 'B', value: 'B' },
+        { label: 'C', value: 'C' }
+      ],
+      addInfo: {
+        supplierCode: '',
+        supplierName: '',
+        assessAnnual: '',
+        annualAssessResult: '',
+        annualAssessIllustration: '',
+        annualAssessDate: '',
+        annualAssessFile: ''
+      }
+    }
+  },
+  watch: {
+    dataInfo: {
+      handler(val) {
+        console.log(val)
+        if (val != '') {
+          const temp = { ...this.addInfo }
+          this.addInfo = {
+            supplierCode: val.supplierCode,
+            supplierName: val.supplierName,
+            assessAnnual: temp.assessAnnual,
+            annualAssessResult: temp.annualAssessResult,
+            annualAssessIllustration: temp.annualAssessIllustration,
+            annualAssessDate: temp.annualAssessDate,
+            annualAssessFile: temp.annualAssessFile
+          }
+          console.log(this.addInfo)
+        }
+      },
+      deep: true,
+      immediate: true
+    }
+  },
+  methods: {
+    close() {
+      this.$emit('close')
+    },
+    // 照片上传
+    handleAvatarSuccess(res, file) {
+      this.fileName = res.data.fileName
+      console.log(res, file)
+      this.imageUrl = URL.createObjectURL(file.raw)
+      console.log(this.addInfo.annualAssessFile, 'this.addInfo.annualAssessFile')
+      if (this.addInfo.annualAssessFile == '') {
+        console.log('1')
+        this.addInfo.annualAssessFile = res.data.fileId
+      } else {
+        console.log('2')
+        this.addInfo.annualAssessFile = this.addInfo.annualAssessFile + ',' + res.data.fileId
+      }
+      console.log(this.addInfo.annualAssessFile)
+    },
+    handleAvatarSuccess2(res, file) {
+      this.fileName2 = res.data.fileName
+      console.log(res, file)
+      this.imageUrl2 = URL.createObjectURL(file.raw)
+      if (this.addInfo.annualAssessFile == '') {
+        console.log('3')
+        this.addInfo.annualAssessFile = res.data.fileId
+      } else {
+        console.log('4')
+        this.addInfo.annualAssessFile = this.addInfo.annualAssessFile + ',' + res.data.fileId
+      }
+      console.log(this.addInfo.annualAssessFile)
+    },
+    beforeAvatarUpload(file) {
+      const isJPG = file.type === 'image/jpeg'
+      const isLt2M = file.size / 1024 / 1024 < 2
+
+      if (!isJPG) {
+        this.$message.error('上传头像图片只能是 JPG 格式!')
+      }
+      if (!isLt2M) {
+        this.$message.error('上传头像图片大小不能超过 2MB!')
+      }
+      return isJPG && isLt2M
+    },
+    save() {
+      assessAdd(this.addInfo).then(res => {
+        console.log(res)
+        if (!res.code) {
+          this.close()
+          Message.success('保存成功')
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style lang='scss' scoped>
+.assessDialog {
+  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: 600px;
+      height: 250px;
+      display: flex;
+      justify-content: space-between;
+      padding: 10px 40px;
+      border: 1px solid #000;
+
+      .img-item {
+        width: 178px;
+        height: 200px;
+
+        .title-box {
+          display: flex;
+          justify-content: space-between;
+
+          .img-title {
+            width: 150px;
+            white-space: nowrap;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            margin-right: 20px;
+          }
+
+          .img-btn {
+            .btn {
+              padding: 0;
+            }
+          }
+        }
+      }
+    }
+  }
+
+  .btnBox {
+    padding: 30px;
+    box-sizing: border-box;
+    display: flex;
+    align-items: center;
+    justify-content: space-evenly;
+
+    .save,
+    .close {
+      width: 100px;
+    }
+
+  }
+}
+
+.avatar-uploader .el-upload {
+  border: 1px dashed #d9d9d9;
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+}
+
+.avatar-uploader .el-upload:hover {
+  border-color: #409EFF;
+}
+
+.avatar-uploader-icon {
+  font-size: 28px;
+  color: #8c939d;
+  width: 178px;
+  height: 178px;
+  line-height: 178px;
+  text-align: center;
+}
+
+.avatar {
+  width: 178px;
+  height: 178px;
+  display: block;
+}
+</style>

diff --git a/src/api/supplier/supplier.js b/src/api/supplier/supplier.js
index 0fd037c..fe31ad0 100644
--- a/src/api/supplier/supplier.js
+++ b/src/api/supplier/supplier.js
@@ -48,7 +48,7 @@
 
 // 新增
 const evaluateAdd = (data) => {
-  return instance.post('/supplierInputReview/add', data)
+  return instance.post('/supplierQuarterlyEvaluate/add', data)
 }
 
 // 年度考核不分页列表
diff --git a/src/components/mycomponent/dialog/assessDialog.vue b/src/components/mycomponent/dialog/assessDialog.vue
deleted file mode 100644
index 5bb387d..0000000
--- a/src/components/mycomponent/dialog/assessDialog.vue
+++ /dev/null
@@ -1,364 +0,0 @@
-<!--年度考核弹窗-->
-<template>
-  <el-dialog title="年度考核" width="975px" :visible.sync="isShowInfo" append-to-body @close="close">
-    <div class="assessDialog">
-      <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.assessAnnual" clearable placeholder="请选择" style="width:200px">
-                <el-option v-for="item in yearOptions" :key="item.value" :label="item.label" :value="item.value" />
-              </el-select>
-            </input-vue>
-          </div>
-          <div class="inputBox">
-            <input-vue
-              v-model="addInfo.annualAssessIllustration"
-              title="年度考核说明"
-              class="inputWidth"
-              placeholder="请输入年度考核说明"
-              width="200px"
-            />
-          </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">
-            <red-star />
-            <input-vue title="考核结果" class="inputWidth">
-              <el-select v-model="addInfo.annualAssessResult" clearable placeholder="请选择" style="width:200px">
-                <el-option v-for="item in resultOptions" :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.annualAssessDate"
-                placeholder="请选择日期"
-                suffix-icon="el-icon-date"
-                style="width:200px"
-              />
-            </input-vue>
-          </div>
-        </div>
-      </div>
-      <div class="imgContent">
-        <div class="img-box">
-          <div class="img-item">
-            <div v-if="fileName" class="title-box">
-              <div class="img-title">
-                {{ fileName }}
-              </div>
-              <div class="img-btn">
-                <el-button type="text" class="btn">
-                  下载
-                </el-button>
-              </div>
-            </div>
-            <el-upload
-              class="avatar-uploader"
-              :headers="myHeaders"
-              action="http://111.198.10.15:21403/file/uploadFile"
-              :show-file-list="false"
-              :on-success="handleAvatarSuccess"
-              :before-upload="beforeAvatarUpload"
-            >
-              <img v-if="imageUrl" :src="imageUrl" class="avatar">
-              <i v-else class="el-icon-plus avatar-uploader-icon" />
-            </el-upload>
-          </div>
-          <div class="img-item">
-            <div v-if="fileName2" class="title-box">
-              <div class="img-title">
-                {{ fileName2 }}
-              </div>
-              <div class="img-btn">
-                <el-button type="text" class="btn">
-                  下载
-                </el-button>
-              </div>
-            </div>
-            <el-upload
-              class="avatar-uploader"
-              :headers="myHeaders"
-              action="http://111.198.10.15:21403/file/uploadFile"
-              :show-file-list="false"
-              :on-success="handleAvatarSuccess2"
-              :before-upload="beforeAvatarUpload"
-            >
-              <img v-if="imageUrl2" :src="imageUrl2" class="avatar">
-              <i v-else class="el-icon-plus avatar-uploader-icon" />
-            </el-upload>
-          </div>
-        </div>
-        <div class="uploadbtn">
-          <el-button type="primary">
-            上传录库评审结果
-          </el-button>
-        </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 { getToken } from '@/utils/auth'
-import { Message } from 'element-ui'
-import { assessAdd } from '../../../api/supplier/supplier'
-export default {
-  components: { inputVue, dialogHeader, RedStar },
-  props: {
-    dataInfo: {
-      type: Object,
-      dataInfo: {}
-    }
-  },
-  data() {
-    return {
-      fileName: '',
-      imageUrl: '',
-      imageUrl2: '',
-      fileName2: '',
-      myHeaders: { token: getToken() },
-      isShowInfo: true,
-      yearOptions: [
-        { label: '2021', value: '2021' },
-        { label: '2022', value: '2022' }
-      ],
-      resultOptions: [
-        { label: 'A', value: 'A' },
-        { label: 'B', value: 'B' },
-        { label: 'C', value: 'C' }
-      ],
-      addInfo: {
-        supplierCode: '',
-        supplierName: '',
-        assessAnnual: '',
-        annualAssessResult: '',
-        annualAssessIllustration: '',
-        annualAssessDate: '',
-        annualAssessFile: ''
-      }
-    }
-  },
-  watch: {
-    dataInfo: {
-      handler(val) {
-        console.log(val)
-        if (val != '') {
-          const temp = { ...this.addInfo }
-          this.addInfo = {
-            supplierCode: val.supplierCode,
-            supplierName: val.supplierName,
-            assessAnnual: temp.assessAnnual,
-            annualAssessResult: temp.annualAssessResult,
-            annualAssessIllustration: temp.annualAssessIllustration,
-            annualAssessDate: temp.annualAssessDate,
-            annualAssessFile: temp.annualAssessFile
-          }
-          console.log(this.addInfo)
-        }
-      },
-      deep: true,
-      immediate: true
-    }
-  },
-  methods: {
-    close() {
-      this.$emit('close')
-    },
-    // 照片上传
-    handleAvatarSuccess(res, file) {
-      this.fileName = res.data.fileName
-      console.log(res, file)
-      this.imageUrl = URL.createObjectURL(file.raw)
-      console.log(this.addInfo.annualAssessFile, 'this.addInfo.annualAssessFile')
-      if (this.addInfo.annualAssessFile == '') {
-        console.log('1')
-        this.addInfo.annualAssessFile = res.data.fileId
-      } else {
-        console.log('2')
-        this.addInfo.annualAssessFile = this.addInfo.annualAssessFile + ',' + res.data.fileId
-      }
-      console.log(this.addInfo.annualAssessFile)
-    },
-    handleAvatarSuccess2(res, file) {
-      this.fileName2 = res.data.fileName
-      console.log(res, file)
-      this.imageUrl2 = URL.createObjectURL(file.raw)
-      if (this.addInfo.annualAssessFile == '') {
-        console.log('3')
-        this.addInfo.annualAssessFile = res.data.fileId
-      } else {
-        console.log('4')
-        this.addInfo.annualAssessFile = this.addInfo.annualAssessFile + ',' + res.data.fileId
-      }
-      console.log(this.addInfo.annualAssessFile)
-    },
-    beforeAvatarUpload(file) {
-      const isJPG = file.type === 'image/jpeg'
-      const isLt2M = file.size / 1024 / 1024 < 2
-
-      if (!isJPG) {
-        this.$message.error('上传头像图片只能是 JPG 格式!')
-      }
-      if (!isLt2M) {
-        this.$message.error('上传头像图片大小不能超过 2MB!')
-      }
-      return isJPG && isLt2M
-    },
-    save() {
-      assessAdd(this.addInfo).then(res => {
-        console.log(res)
-        if (!res.code) {
-          this.close()
-          Message.success('保存成功')
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style lang='scss' scoped>
-.assessDialog {
-  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: 600px;
-      height: 250px;
-      display: flex;
-      justify-content: space-between;
-      padding: 10px 40px;
-      border: 1px solid #000;
-
-      .img-item {
-        width: 178px;
-        height: 200px;
-
-        .title-box {
-          display: flex;
-          justify-content: space-between;
-
-          .img-title {
-            width: 150px;
-            white-space: nowrap;
-            overflow: hidden;
-            text-overflow: ellipsis;
-            margin-right: 20px;
-          }
-
-          .img-btn {
-            .btn {
-              padding: 0;
-            }
-          }
-        }
-      }
-    }
-  }
-
-  .btnBox {
-    padding: 30px;
-    box-sizing: border-box;
-    display: flex;
-    align-items: center;
-    justify-content: space-evenly;
-
-    .save,
-    .close {
-      width: 100px;
-    }
-
-  }
-}
-
-.avatar-uploader .el-upload {
-  border: 1px dashed #d9d9d9;
-  border-radius: 6px;
-  cursor: pointer;
-  position: relative;
-  overflow: hidden;
-}
-
-.avatar-uploader .el-upload:hover {
-  border-color: #409EFF;
-}
-
-.avatar-uploader-icon {
-  font-size: 28px;
-  color: #8c939d;
-  width: 178px;
-  height: 178px;
-  line-height: 178px;
-  text-align: center;
-}
-
-.avatar {
-  width: 178px;
-  height: 178px;
-  display: block;
-}
-</style>
diff --git a/src/components/mycomponent/dialog/evaluateDialog.vue b/src/components/mycomponent/dialog/evaluateDialog.vue
deleted file mode 100644
index ba3ad75..0000000
--- a/src/components/mycomponent/dialog/evaluateDialog.vue
+++ /dev/null
@@ -1,365 +0,0 @@
-<!--季度评价弹窗-->
-<template>
-  <el-dialog title="季度评价" width="975px" :visible.sync="isShowInfo" append-to-body @close="close">
-    <div class="evaluateDialog">
-      <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.evaluateQuarterly" clearable placeholder="请选择" style="width:200px">
-                <el-option v-for="item in quarterOptions" :key="item.value" :label="item.label" :value="item.value" />
-              </el-select>
-            </input-vue>
-          </div>
-          <div class="inputBox">
-            <input-vue
-              v-model="addInfo.quarterlyEvaluateIllustration"
-              title="季度评价说明"
-              class="inputWidth"
-              placeholder="请输入季度评价说明"
-              width="200px"
-            />
-          </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">
-            <red-star />
-            <input-vue title="季度评价结果" class="inputWidth">
-              <el-select v-model="addInfo.quarterlyEvaluateResult" clearable placeholder="请选择" style="width:200px">
-                <el-option v-for="item in resultOptions" :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.quarterlyEvaluateDate"
-                placeholder="请选择日期"
-                suffix-icon="el-icon-date"
-                style="width:200px"
-              />
-            </input-vue>
-          </div>
-        </div>
-      </div>
-      <div class="imgContent">
-        <div class="img-box">
-          <div class="img-item">
-            <div v-if="fileName" class="title-box">
-              <div class="img-title">
-                {{ fileName }}
-              </div>
-              <div class="img-btn">
-                <el-button type="text" class="btn">
-                  下载
-                </el-button>
-              </div>
-            </div>
-            <el-upload
-              class="avatar-uploader"
-              :headers="myHeaders"
-              action="http://111.198.10.15:21403/file/uploadFile"
-              :show-file-list="false"
-              :on-success="handleAvatarSuccess"
-              :before-upload="beforeAvatarUpload"
-            >
-              <img v-if="imageUrl" :src="imageUrl" class="avatar">
-              <i v-else class="el-icon-plus avatar-uploader-icon" />
-            </el-upload>
-          </div>
-          <div class="img-item">
-            <div v-if="fileName2" class="title-box">
-              <div class="img-title">
-                {{ fileName2 }}
-              </div>
-              <div class="img-btn">
-                <el-button type="text" class="btn">
-                  下载
-                </el-button>
-              </div>
-            </div>
-            <el-upload
-              class="avatar-uploader"
-              :headers="myHeaders"
-              action="http://111.198.10.15:21403/file/uploadFile"
-              :show-file-list="false"
-              :on-success="handleAvatarSuccess2"
-              :before-upload="beforeAvatarUpload"
-            >
-              <img v-if="imageUrl2" :src="imageUrl2" class="avatar">
-              <i v-else class="el-icon-plus avatar-uploader-icon" />
-            </el-upload>
-          </div>
-        </div>
-        <div class="uploadbtn">
-          <el-button type="primary">
-            上传录库评审结果
-          </el-button>
-        </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 { getToken } from '@/utils/auth'
-import { Message } from 'element-ui'
-import { evaluateAdd } from '../../../api/supplier/supplier'
-
-export default {
-  components: { inputVue, dialogHeader, RedStar },
-  props: {
-    dataInfo: {
-      type: Object,
-      dataInfo: {}
-    }
-  },
-  data() {
-    return {
-      isShowInfo: true,
-      fileName: '',
-      imageUrl: '',
-      imageUrl2: '',
-      fileName2: '',
-      myHeaders: { token: getToken() },
-      quarterOptions: [
-        { label: '2021第一季度', value: '2021第一季度' },
-        { label: '2021第二季度', value: '2021第二季度' }
-      ],
-      resultOptions: [
-        { label: 'A', value: 'A' },
-        { label: 'B', value: 'B' },
-        { label: 'C', value: 'C' }
-      ],
-      addInfo: {
-        supplierCode: '',
-        supplierName: '',
-        evaluateQuarterly: '',
-        quarterlyEvaluateResult: '',
-        quarterlyEvaluateIllustration: '',
-        quarterlyEvaluateDate: '',
-        quarterlyEvaluateFile: ''
-      }
-    }
-  },
-  watch: {
-    dataInfo: {
-      handler(val) {
-        console.log(val)
-        if (val != '') {
-          const temp = { ...this.addInfo }
-          this.addInfo = {
-            supplierCode: val.supplierCode,
-            supplierName: val.supplierName,
-            evaluateQuarterly: temp.evaluateQuarterly,
-            quarterlyEvaluateResult: temp.quarterlyEvaluateResult,
-            quarterlyEvaluateIllustration: temp.quarterlyEvaluateIllustration,
-            quarterlyEvaluateDate: temp.quarterlyEvaluateDate,
-            quarterlyEvaluateFile: temp.quarterlyEvaluateFile
-          }
-          console.log(this.addInfo)
-        }
-      },
-      deep: true,
-      immediate: true
-    }
-  },
-  methods: {
-    close() {
-      this.$emit('close')
-    },
-    // 照片上传
-    handleAvatarSuccess(res, file) {
-      this.fileName = res.data.fileName
-      console.log(res, file)
-      this.imageUrl = URL.createObjectURL(file.raw)
-      console.log(this.addInfo.quarterlyEvaluateFile, 'this.addInfo.quarterlyEvaluateFile')
-      if (this.addInfo.quarterlyEvaluateFile == '') {
-        console.log('1')
-        this.addInfo.quarterlyEvaluateFile = res.data.fileId
-      } else {
-        console.log('2')
-        this.addInfo.quarterlyEvaluateFile = this.addInfo.quarterlyEvaluateFile + ',' + res.data.fileId
-      }
-      console.log(this.addInfo.quarterlyEvaluateFile)
-    },
-    handleAvatarSuccess2(res, file) {
-      this.fileName2 = res.data.fileName
-      console.log(res, file)
-      this.imageUrl2 = URL.createObjectURL(file.raw)
-      if (this.addInfo.quarterlyEvaluateFile == '') {
-        console.log('3')
-        this.addInfo.quarterlyEvaluateFile = res.data.fileId
-      } else {
-        console.log('4')
-        this.addInfo.quarterlyEvaluateFile = this.addInfo.quarterlyEvaluateFile + ',' + res.data.fileId
-      }
-      console.log(this.addInfo.quarterlyEvaluateFile)
-    },
-    beforeAvatarUpload(file) {
-      const isJPG = file.type === 'image/jpeg'
-      const isLt2M = file.size / 1024 / 1024 < 2
-
-      if (!isJPG) {
-        this.$message.error('上传头像图片只能是 JPG 格式!')
-      }
-      if (!isLt2M) {
-        this.$message.error('上传头像图片大小不能超过 2MB!')
-      }
-      return isJPG && isLt2M
-    },
-    save() {
-      evaluateAdd(this.addInfo).then(res => {
-        console.log(res)
-        if (!res.code) {
-          this.close()
-          Message.success('保存成功')
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style lang='scss' scoped>
-.evaluateDialog {
-  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: 600px;
-      height: 250px;
-      display: flex;
-      justify-content: space-between;
-      padding: 10px 40px;
-      border: 1px solid #000;
-
-      .img-item {
-        width: 178px;
-        height: 200px;
-
-        .title-box {
-          display: flex;
-          justify-content: space-between;
-
-          .img-title {
-            width: 150px;
-            white-space: nowrap;
-            overflow: hidden;
-            text-overflow: ellipsis;
-            margin-right: 20px;
-          }
-
-          .img-btn {
-            .btn {
-              padding: 0;
-            }
-          }
-        }
-      }
-    }
-  }
-
-  .btnBox {
-    padding: 30px;
-    box-sizing: border-box;
-    display: flex;
-    align-items: center;
-    justify-content: space-evenly;
-
-    .save,
-    .close {
-      width: 100px;
-    }
-
-  }
-}
-
-.avatar-uploader .el-upload {
-  border: 1px dashed #d9d9d9;
-  border-radius: 6px;
-  cursor: pointer;
-  position: relative;
-  overflow: hidden;
-}
-
-.avatar-uploader .el-upload:hover {
-  border-color: #409EFF;
-}
-
-.avatar-uploader-icon {
-  font-size: 28px;
-  color: #8c939d;
-  width: 178px;
-  height: 178px;
-  line-height: 178px;
-  text-align: center;
-}
-
-.avatar {
-  width: 178px;
-  height: 178px;
-  display: block;
-}
-</style>
diff --git a/src/components/mycomponent/dialog/historyAssessDialog.vue b/src/components/mycomponent/dialog/historyAssessDialog.vue
deleted file mode 100644
index 30a0c57..0000000
--- a/src/components/mycomponent/dialog/historyAssessDialog.vue
+++ /dev/null
@@ -1,146 +0,0 @@
-<!--历史考核弹窗-->
-<template>
-  <div class="historyAssessDialog dialog">
-    <dialog-header title="历史考核" @close="close" />
-    <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="assessAnnualName" label="考核年度" width="150" />
-        <el-table-column prop="annualAssessResultName" label="年度考核结果" width="150" />
-        <el-table-column prop="annualAssessIllustration" label="年度考核说明" width="150" />
-        <el-table-column prop="annualAssessDate" label="年度考核时间" width="150" />
-        <el-table-column prop="annualAssessFile" 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>
-</template>
-
-<script>
-import dialogHeader from './dialogHeader.vue'
-import inputVue from '../input/inputVue.vue'
-import RedStar from '../redStar.vue'
-
-import { historyAssess } from '../../../api/supplier/supplier'
-
-export default {
-  components: { inputVue, dialogHeader, RedStar },
-  props: {
-    dataInfo: {
-      type: Object,
-      dataInfo: {}
-    }
-  },
-  data() {
-    return {
-      tableData: []
-    }
-  },
-  mounted() {
-    this.getHistoryAssess()
-  },
-  methods: {
-    // 生成序号
-    indexMethod(index) {
-      return index + 1
-    },
-    // 合并表头
-    headerStyle({ row, column, rowIndex, columnIndex }) {
-      row[5].colSpan = 2 // 第三列的表头占据2个单元格
-      row[6].colSpan = 0
-      if (columnIndex === 6) {
-        return 'display: none'
-      }
-    },
-    close() {
-      this.$emit('close')
-    },
-    getHistoryAssess() {
-      historyAssess().then(res => {
-        console.log(res)
-        this.tableData = res
-      })
-    }
-  }
-}
-</script>
-
-<style lang='scss' scoped>
-.historyAssessDialog {
-  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 {
-    margin: 20px;
-  }
-
-}
-</style>
diff --git a/src/components/mycomponent/dialog/historyEvaluateDialog.vue b/src/components/mycomponent/dialog/historyEvaluateDialog.vue
deleted file mode 100644
index 8fce92f..0000000
--- a/src/components/mycomponent/dialog/historyEvaluateDialog.vue
+++ /dev/null
@@ -1,148 +0,0 @@
-<!--历史评价弹窗-->
-<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>
-</template>
-
-<script>
-import dialogHeader from './dialogHeader.vue'
-import inputVue from '../input/inputVue.vue'
-import RedStar from '../redStar.vue'
-
-import { historyEvaluate } from '../../../api/supplier/supplier'
-
-export default {
-  components: { inputVue, dialogHeader, RedStar },
-  props: {
-    dataInfo: {
-      type: Object,
-      dataInfo: {}
-    }
-  },
-  data() {
-    return {
-      isShowInfo: true,
-      tableData: []
-    }
-  },
-  mounted() {
-    this.getHistoryEvaluate()
-  },
-  methods: {
-    // 生成序号
-    indexMethod(index) {
-      return index + 1
-    },
-    // 合并表头
-    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)
-        this.tableData = res
-      })
-    }
-  }
-}
-</script>
-
-<style lang='scss' scoped>
-.historyEvaluateDialog {
-  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 {
-        display: flex;
-        justify-content: inherit;
-        align-items: center;
-      }
-    }
-
-  }
-
-  .Dialog-table {
-    margin: 20px;
-  }
-
-}
-</style>
diff --git a/src/views/supplier/assess.vue b/src/views/supplier/assess.vue
index 5315ce9..aa1b324 100644
--- a/src/views/supplier/assess.vue
+++ b/src/views/supplier/assess.vue
@@ -86,8 +86,8 @@
 
 <script>
 import GroupPage from '../../components/mycomponent/groupPage.vue'
-import assessDialog from '../../components/mycomponent/dialog/assessDialog.vue'
-import historyAssessDialog from '../../components/mycomponent/dialog/historyAssessDialog.vue'
+import assessDialog from './assessDialog.vue'
+import historyAssessDialog from './historyAssessDialog.vue'
 
 import { a_list } from '../../api/supplier/supplier'
 import { tableRowClassName } from '../../utils/myUtils/changeTableTr'
diff --git a/src/views/supplier/assessDialog.vue b/src/views/supplier/assessDialog.vue
new file mode 100644
index 0000000..fd4bc00
--- /dev/null
+++ b/src/views/supplier/assessDialog.vue
@@ -0,0 +1,368 @@
+<!--年度考核弹窗-->
+<template>
+  <el-dialog title="年度考核" width="975px" :visible.sync="isShowInfo" append-to-body @close="close">
+    <div class="assessDialog">
+      <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.assessAnnual" clearable placeholder="请选择" style="width:200px">
+                <el-option v-for="item in yearOptions" :key="item.value" :label="item.label" :value="item.value" />
+              </el-select>
+            </input-vue>
+          </div>
+          <div class="inputBox">
+            <input-vue
+              v-model="addInfo.annualAssessIllustration"
+              title="年度考核说明"
+              class="inputWidth"
+              placeholder="请输入年度考核说明"
+              width="200px"
+            />
+          </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">
+            <red-star />
+            <input-vue title="考核结果" class="inputWidth">
+              <el-select v-model="addInfo.annualAssessResult" clearable placeholder="请选择" style="width:200px">
+                <el-option v-for="item in resultOptions" :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.annualAssessDate"
+                placeholder="请选择日期"
+                suffix-icon="el-icon-date"
+                style="width:200px"
+              />
+            </input-vue>
+          </div>
+        </div>
+      </div>
+      <div class="imgContent">
+        <div class="img-box">
+          <div class="img-item">
+            <div v-if="fileName" class="title-box">
+              <div class="img-title">
+                {{ fileName }}
+              </div>
+              <div class="img-btn">
+                <el-button type="text" class="btn">
+                  下载
+                </el-button>
+              </div>
+            </div>
+            <el-upload
+              class="avatar-uploader"
+              :headers="myHeaders"
+              action="http://111.198.10.15:21403/file/uploadFile"
+              :show-file-list="false"
+              :on-success="handleAvatarSuccess"
+              :before-upload="beforeAvatarUpload"
+            >
+              <img v-if="imageUrl" :src="imageUrl" class="avatar">
+              <i v-else class="el-icon-plus avatar-uploader-icon" />
+            </el-upload>
+          </div>
+          <div class="img-item">
+            <div v-if="fileName2" class="title-box">
+              <div class="img-title">
+                {{ fileName2 }}
+              </div>
+              <div class="img-btn">
+                <el-button type="text" class="btn">
+                  下载
+                </el-button>
+              </div>
+            </div>
+            <el-upload
+              class="avatar-uploader"
+              :headers="myHeaders"
+              action="http://111.198.10.15:21403/file/uploadFile"
+              :show-file-list="false"
+              :on-success="handleAvatarSuccess2"
+              :before-upload="beforeAvatarUpload"
+            >
+              <img v-if="imageUrl2" :src="imageUrl2" class="avatar">
+              <i v-else class="el-icon-plus avatar-uploader-icon" />
+            </el-upload>
+          </div>
+        </div>
+        <div class="uploadbtn">
+          <el-button type="primary">
+            上传录库评审结果
+          </el-button>
+        </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 '../../components/mycomponent/dialog/dialogHeader.vue'
+import inputVue from '../../components/mycomponent/input/inputVue.vue'
+import RedStar from '../../components/mycomponent/redStar.vue'
+
+import { getToken } from '@/utils/auth'
+import { Message } from 'element-ui'
+import { assessAdd } from '../../api/supplier/supplier'
+export default {
+  name: 'AssessDialog',
+  components: { inputVue, dialogHeader, RedStar },
+  props: {
+    assessAnnualOpts: {
+      type: Array,
+      default() {
+        return []
+      },
+      required: true
+    }
+  },
+  data() {
+    return {
+      fileName: '',
+      imageUrl: '',
+      imageUrl2: '',
+      fileName2: '',
+      myHeaders: { token: getToken() },
+      isShowInfo: true,
+      yearOptions: [
+        { label: '2021', value: '2021' },
+        { label: '2022', value: '2022' }
+      ],
+      resultOptions: [
+        { label: 'A', value: 'A' },
+        { label: 'B', value: 'B' },
+        { label: 'C', value: 'C' }
+      ],
+      addInfo: {
+        supplierCode: '',
+        supplierName: '',
+        assessAnnual: '',
+        annualAssessResult: '',
+        annualAssessIllustration: '',
+        annualAssessDate: '',
+        annualAssessFile: ''
+      }
+    }
+  },
+  watch: {
+    dataInfo: {
+      handler(val) {
+        console.log(val)
+        if (val != '') {
+          const temp = { ...this.addInfo }
+          this.addInfo = {
+            supplierCode: val.supplierCode,
+            supplierName: val.supplierName,
+            assessAnnual: temp.assessAnnual,
+            annualAssessResult: temp.annualAssessResult,
+            annualAssessIllustration: temp.annualAssessIllustration,
+            annualAssessDate: temp.annualAssessDate,
+            annualAssessFile: temp.annualAssessFile
+          }
+          console.log(this.addInfo)
+        }
+      },
+      deep: true,
+      immediate: true
+    }
+  },
+  methods: {
+    close() {
+      this.$emit('close')
+    },
+    // 照片上传
+    handleAvatarSuccess(res, file) {
+      this.fileName = res.data.fileName
+      console.log(res, file)
+      this.imageUrl = URL.createObjectURL(file.raw)
+      console.log(this.addInfo.annualAssessFile, 'this.addInfo.annualAssessFile')
+      if (this.addInfo.annualAssessFile == '') {
+        console.log('1')
+        this.addInfo.annualAssessFile = res.data.fileId
+      } else {
+        console.log('2')
+        this.addInfo.annualAssessFile = this.addInfo.annualAssessFile + ',' + res.data.fileId
+      }
+      console.log(this.addInfo.annualAssessFile)
+    },
+    handleAvatarSuccess2(res, file) {
+      this.fileName2 = res.data.fileName
+      console.log(res, file)
+      this.imageUrl2 = URL.createObjectURL(file.raw)
+      if (this.addInfo.annualAssessFile == '') {
+        console.log('3')
+        this.addInfo.annualAssessFile = res.data.fileId
+      } else {
+        console.log('4')
+        this.addInfo.annualAssessFile = this.addInfo.annualAssessFile + ',' + res.data.fileId
+      }
+      console.log(this.addInfo.annualAssessFile)
+    },
+    beforeAvatarUpload(file) {
+      const isJPG = file.type === 'image/jpeg'
+      const isLt2M = file.size / 1024 / 1024 < 2
+
+      if (!isJPG) {
+        this.$message.error('上传头像图片只能是 JPG 格式!')
+      }
+      if (!isLt2M) {
+        this.$message.error('上传头像图片大小不能超过 2MB!')
+      }
+      return isJPG && isLt2M
+    },
+    save() {
+      assessAdd(this.addInfo).then(res => {
+        console.log(res)
+        if (!res.code) {
+          this.close()
+          Message.success('保存成功')
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style lang='scss' scoped>
+.assessDialog {
+  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: 600px;
+      height: 250px;
+      display: flex;
+      justify-content: space-between;
+      padding: 10px 40px;
+      border: 1px solid #000;
+
+      .img-item {
+        width: 178px;
+        height: 200px;
+
+        .title-box {
+          display: flex;
+          justify-content: space-between;
+
+          .img-title {
+            width: 150px;
+            white-space: nowrap;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            margin-right: 20px;
+          }
+
+          .img-btn {
+            .btn {
+              padding: 0;
+            }
+          }
+        }
+      }
+    }
+  }
+
+  .btnBox {
+    padding: 30px;
+    box-sizing: border-box;
+    display: flex;
+    align-items: center;
+    justify-content: space-evenly;
+
+    .save,
+    .close {
+      width: 100px;
+    }
+
+  }
+}
+
+.avatar-uploader .el-upload {
+  border: 1px dashed #d9d9d9;
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+}
+
+.avatar-uploader .el-upload:hover {
+  border-color: #409EFF;
+}
+
+.avatar-uploader-icon {
+  font-size: 28px;
+  color: #8c939d;
+  width: 178px;
+  height: 178px;
+  line-height: 178px;
+  text-align: center;
+}
+
+.avatar {
+  width: 178px;
+  height: 178px;
+  display: block;
+}
+</style>
diff --git a/src/views/supplier/evaluate.vue b/src/views/supplier/evaluate.vue
index f3ee896..7653a58 100644
--- a/src/views/supplier/evaluate.vue
+++ b/src/views/supplier/evaluate.vue
@@ -3,33 +3,26 @@
   <div class="evaluate">
     <div class="evaluate-inputs">
       供应商编号
-      <el-input
-        v-model="selectInfo.supplierCode"
-        style="width: 200px"
-        placeholder="请输入编号"
-        clearable
-        class="evaluate-input"
-      />
+      <el-input v-model="selectInfo.supplierCode" style="width: 200px" placeholder="请输入编号" clearable class="evaluate-input"/>
 
       供应商名称
-      <el-input
-        v-model="selectInfo.supplierName"
-        style="width: 200px"
-        placeholder="请输入供应商名称"
-        clearable
-        class="evaluate-input"
-      />
+      <el-input v-model="selectInfo.supplierName" style="width: 200px" placeholder="请输入供应商名称" clearable class="evaluate-input"/>
 
-      评价时间
-      <el-select
-        v-model="selectInfo.evaluateQuarterly"
-        class="evaluate-select"
-        filterable
-        placeholder="请选择结果"
-        style="width: 200px"
-      >
-        <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
+      年份
+      <el-select v-model="selectInfo.evaluateYear" class="evaluate-select" clearable placeholder="请选择年份" style="width: 150px">
+        <el-option v-for="item in evaluateAnnualOpts" :key="item.id" :label="item.name" :value="item.value" />
       </el-select>
+
+      季度
+      <el-select v-model="selectInfo.evaluateQuarterly" class="evaluate-select" clearable placeholder="请选择季度" style="width: 150px">
+        <el-option v-for="item in evaluateQuarterlyOpts" :key="item.id" :label="item.name" :value="item.value" />
+      </el-select>
+
+      评价结果
+      <el-select v-model="selectInfo.quarterlyEvaluateResult" class="evaluate-select" clearable placeholder="请选择评价结果" style="width: 150px">
+        <el-option v-for="item in evaluateResultOpts" :key="item.id" :label="item.name" :value="item.value" />
+      </el-select>
+
       <div class="evaluate-btns">
         <el-button type="primary" class="evaluate-button" @click="selectData">
           查询
@@ -51,14 +44,18 @@
         :row-style="{ 'text-align': 'center' }"
         style="width: 100%"
       >
-        <el-table-column type="index" label="序号" width="180" />
-        <el-table-column prop="supplierCode" label="供应商编号" width="180" />
-        <el-table-column prop="supplierName" label="供应商名称" />
-        <el-table-column prop="supplierStatusName" label="供应商状态" />
-        <el-table-column prop="evaluateQuarterlyName" label="最新季度评价" />
-        <el-table-column prop="quarterlyEvaluateResult" label="季度评价结果" />
-        <el-table-column prop="quarterlyEvaluateDate" label="季度评价日期" />
-        <el-table-column header-align="center" align="center" fixed="right" label="操作">
+        <el-table-column type="index" label="序号" width="100" />
+        <el-table-column prop="supplierCode" label="供应商编号" width="200" />
+        <el-table-column prop="supplierName" label="供应商名称" width="400" />
+        <el-table-column prop="supplierStatusName" label="供应商状态" width="100" />
+        <el-table-column label="最新评价季度">
+          <template v-if="scope.row.evaluateYearName !== ''" slot-scope="scope">
+            {{ scope.row.evaluateYearName }}年{{ scope.row.evaluateQuarterlyName }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="quarterlyEvaluateResultName" label="季度评价结果" width="150" />
+        <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)">
               历史评价
@@ -80,21 +77,29 @@
       />
     </div>
     <historyEvaluateDialog v-if="isShowHistoryDialog" :data-info="dataInfo" @close="evaluateHistoryDialogClose" />
-    <evaluateDialog v-if="isShowDialog" :data-info="dataInfo" @close="evaluateDialogClose" />
+    <evaluate-dialog
+      ref="evaluateDialog"
+                     @refreshList="selectData"
+                     :evaluate-annual-opts="evaluateAnnualOpts"
+                     :evaluate-quarterly-opts="evaluateQuarterlyOpts"
+                     :evaluate-result-opts="evaluateResultOpts"
+    />
   </div>
 </template>
 
 <script>
 import GroupPage from '../../components/mycomponent/groupPage.vue'
-import evaluateDialog from '../../components/mycomponent/dialog/evaluateDialog.vue'
-import historyEvaluateDialog from '../../components/mycomponent/dialog/historyEvaluateDialog.vue'
+import EvaluateDialog from '@/views/supplier/evaluateDialog'
+import historyEvaluateDialog from './historyEvaluateDialog.vue'
 
 import { e_list } from '../../api/supplier/supplier'
 import { tableRowClassName } from '../../utils/myUtils/changeTableTr'
 import { listMixin } from '../../utils/myUtils/mixins/listPage'
+import { getDictByCode } from '@/api/system/dict'
+
 export default { // 加入分页逻辑
   components: {
-    historyEvaluateDialog, evaluateDialog, GroupPage
+    historyEvaluateDialog, EvaluateDialog, GroupPage
   },
   mixins: [listMixin],
   data() {
@@ -105,18 +110,43 @@
       selectInfo: {
         supplierCode: '',
         supplierName: '',
-        evaluateQuarterly: ''
+        evaluateYear: '',
+        evaluateQuarterly: '',
+        quarterlyEvaluateResult: ''
       },
-      options: [
-        { label: '2022第一季度', value: '2022第一季度' },
-        { label: '2021第二季度', value: '2021第二季度' }
-      ]
+      evaluateAnnualOpts: [],
+      evaluateQuarterlyOpts: [],
+      evaluateResultOpts: []
     }
   },
   mounted() {
+    this.getDictEvaluateAnnual()
+    this.getDictEvaluateQuarterly()
+    this.getDictEvaluateResult()
   },
   methods: {
     tableRowClassName: tableRowClassName,
+    getDictEvaluateAnnual() {
+      getDictByCode('assessAnnual').then(response => {
+        if (response.code === 200) {
+          this.evaluateAnnualOpts = response.data
+        }
+      })
+    },
+    getDictEvaluateQuarterly() {
+      getDictByCode('evaluateQuarterly').then(response => {
+        if (response.code === 200) {
+          this.evaluateQuarterlyOpts = response.data
+        }
+      })
+    },
+    getDictEvaluateResult() {
+      getDictByCode('evaluateResult').then(response => {
+        if (response.code === 200) {
+          this.evaluateResultOpts = response.data
+        }
+      })
+    },
     hitstoryDialog(row) {
       this.dataInfo = row
       this.isShowHistoryDialog = true
@@ -128,10 +158,9 @@
       this.isShowDialog = false
     },
     evaluateDialogClick(row) {
-      this.dataInfo = row
-      this.isShowDialog = true
+      this.$refs.evaluateDialog.initDialog(row)
     },
-    getListPage(limit, offset) {
+    getListPage(limit = 10, offset = 1) {
       e_list(`limit=${limit}&offset=${offset}`, this.queryInfo).then(res => {
         console.log(res)
         this.tableData = res
@@ -141,7 +170,9 @@
       this.selectInfo = { // 搜索框中的数据的数据
         supplierCode: '',
         supplierName: '',
-        evaluateQuarterly: ''
+        evaluateYear: '',
+        evaluateQuarterly: '',
+        quarterlyEvaluateResult: ''
       }
     }
   }
@@ -166,7 +197,7 @@
   }
 
   .evaluate-select {
-    margin: 0 4rem 0 0.5rem;
+    margin: 0 1rem 0 0.5rem;
   }
 
   .evaluate-btns {

diff --git a/src/api/supplier/supplier.js b/src/api/supplier/supplier.js
index 0fd037c..fe31ad0 100644
--- a/src/api/supplier/supplier.js
+++ b/src/api/supplier/supplier.js
@@ -48,7 +48,7 @@
 
 // 新增
 const evaluateAdd = (data) => {
-  return instance.post('/supplierInputReview/add', data)
+  return instance.post('/supplierQuarterlyEvaluate/add', data)
 }
 
 // 年度考核不分页列表
diff --git a/src/components/mycomponent/dialog/assessDialog.vue b/src/components/mycomponent/dialog/assessDialog.vue
deleted file mode 100644
index 5bb387d..0000000
--- a/src/components/mycomponent/dialog/assessDialog.vue
+++ /dev/null
@@ -1,364 +0,0 @@
-<!--年度考核弹窗-->
-<template>
-  <el-dialog title="年度考核" width="975px" :visible.sync="isShowInfo" append-to-body @close="close">
-    <div class="assessDialog">
-      <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.assessAnnual" clearable placeholder="请选择" style="width:200px">
-                <el-option v-for="item in yearOptions" :key="item.value" :label="item.label" :value="item.value" />
-              </el-select>
-            </input-vue>
-          </div>
-          <div class="inputBox">
-            <input-vue
-              v-model="addInfo.annualAssessIllustration"
-              title="年度考核说明"
-              class="inputWidth"
-              placeholder="请输入年度考核说明"
-              width="200px"
-            />
-          </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">
-            <red-star />
-            <input-vue title="考核结果" class="inputWidth">
-              <el-select v-model="addInfo.annualAssessResult" clearable placeholder="请选择" style="width:200px">
-                <el-option v-for="item in resultOptions" :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.annualAssessDate"
-                placeholder="请选择日期"
-                suffix-icon="el-icon-date"
-                style="width:200px"
-              />
-            </input-vue>
-          </div>
-        </div>
-      </div>
-      <div class="imgContent">
-        <div class="img-box">
-          <div class="img-item">
-            <div v-if="fileName" class="title-box">
-              <div class="img-title">
-                {{ fileName }}
-              </div>
-              <div class="img-btn">
-                <el-button type="text" class="btn">
-                  下载
-                </el-button>
-              </div>
-            </div>
-            <el-upload
-              class="avatar-uploader"
-              :headers="myHeaders"
-              action="http://111.198.10.15:21403/file/uploadFile"
-              :show-file-list="false"
-              :on-success="handleAvatarSuccess"
-              :before-upload="beforeAvatarUpload"
-            >
-              <img v-if="imageUrl" :src="imageUrl" class="avatar">
-              <i v-else class="el-icon-plus avatar-uploader-icon" />
-            </el-upload>
-          </div>
-          <div class="img-item">
-            <div v-if="fileName2" class="title-box">
-              <div class="img-title">
-                {{ fileName2 }}
-              </div>
-              <div class="img-btn">
-                <el-button type="text" class="btn">
-                  下载
-                </el-button>
-              </div>
-            </div>
-            <el-upload
-              class="avatar-uploader"
-              :headers="myHeaders"
-              action="http://111.198.10.15:21403/file/uploadFile"
-              :show-file-list="false"
-              :on-success="handleAvatarSuccess2"
-              :before-upload="beforeAvatarUpload"
-            >
-              <img v-if="imageUrl2" :src="imageUrl2" class="avatar">
-              <i v-else class="el-icon-plus avatar-uploader-icon" />
-            </el-upload>
-          </div>
-        </div>
-        <div class="uploadbtn">
-          <el-button type="primary">
-            上传录库评审结果
-          </el-button>
-        </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 { getToken } from '@/utils/auth'
-import { Message } from 'element-ui'
-import { assessAdd } from '../../../api/supplier/supplier'
-export default {
-  components: { inputVue, dialogHeader, RedStar },
-  props: {
-    dataInfo: {
-      type: Object,
-      dataInfo: {}
-    }
-  },
-  data() {
-    return {
-      fileName: '',
-      imageUrl: '',
-      imageUrl2: '',
-      fileName2: '',
-      myHeaders: { token: getToken() },
-      isShowInfo: true,
-      yearOptions: [
-        { label: '2021', value: '2021' },
-        { label: '2022', value: '2022' }
-      ],
-      resultOptions: [
-        { label: 'A', value: 'A' },
-        { label: 'B', value: 'B' },
-        { label: 'C', value: 'C' }
-      ],
-      addInfo: {
-        supplierCode: '',
-        supplierName: '',
-        assessAnnual: '',
-        annualAssessResult: '',
-        annualAssessIllustration: '',
-        annualAssessDate: '',
-        annualAssessFile: ''
-      }
-    }
-  },
-  watch: {
-    dataInfo: {
-      handler(val) {
-        console.log(val)
-        if (val != '') {
-          const temp = { ...this.addInfo }
-          this.addInfo = {
-            supplierCode: val.supplierCode,
-            supplierName: val.supplierName,
-            assessAnnual: temp.assessAnnual,
-            annualAssessResult: temp.annualAssessResult,
-            annualAssessIllustration: temp.annualAssessIllustration,
-            annualAssessDate: temp.annualAssessDate,
-            annualAssessFile: temp.annualAssessFile
-          }
-          console.log(this.addInfo)
-        }
-      },
-      deep: true,
-      immediate: true
-    }
-  },
-  methods: {
-    close() {
-      this.$emit('close')
-    },
-    // 照片上传
-    handleAvatarSuccess(res, file) {
-      this.fileName = res.data.fileName
-      console.log(res, file)
-      this.imageUrl = URL.createObjectURL(file.raw)
-      console.log(this.addInfo.annualAssessFile, 'this.addInfo.annualAssessFile')
-      if (this.addInfo.annualAssessFile == '') {
-        console.log('1')
-        this.addInfo.annualAssessFile = res.data.fileId
-      } else {
-        console.log('2')
-        this.addInfo.annualAssessFile = this.addInfo.annualAssessFile + ',' + res.data.fileId
-      }
-      console.log(this.addInfo.annualAssessFile)
-    },
-    handleAvatarSuccess2(res, file) {
-      this.fileName2 = res.data.fileName
-      console.log(res, file)
-      this.imageUrl2 = URL.createObjectURL(file.raw)
-      if (this.addInfo.annualAssessFile == '') {
-        console.log('3')
-        this.addInfo.annualAssessFile = res.data.fileId
-      } else {
-        console.log('4')
-        this.addInfo.annualAssessFile = this.addInfo.annualAssessFile + ',' + res.data.fileId
-      }
-      console.log(this.addInfo.annualAssessFile)
-    },
-    beforeAvatarUpload(file) {
-      const isJPG = file.type === 'image/jpeg'
-      const isLt2M = file.size / 1024 / 1024 < 2
-
-      if (!isJPG) {
-        this.$message.error('上传头像图片只能是 JPG 格式!')
-      }
-      if (!isLt2M) {
-        this.$message.error('上传头像图片大小不能超过 2MB!')
-      }
-      return isJPG && isLt2M
-    },
-    save() {
-      assessAdd(this.addInfo).then(res => {
-        console.log(res)
-        if (!res.code) {
-          this.close()
-          Message.success('保存成功')
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style lang='scss' scoped>
-.assessDialog {
-  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: 600px;
-      height: 250px;
-      display: flex;
-      justify-content: space-between;
-      padding: 10px 40px;
-      border: 1px solid #000;
-
-      .img-item {
-        width: 178px;
-        height: 200px;
-
-        .title-box {
-          display: flex;
-          justify-content: space-between;
-
-          .img-title {
-            width: 150px;
-            white-space: nowrap;
-            overflow: hidden;
-            text-overflow: ellipsis;
-            margin-right: 20px;
-          }
-
-          .img-btn {
-            .btn {
-              padding: 0;
-            }
-          }
-        }
-      }
-    }
-  }
-
-  .btnBox {
-    padding: 30px;
-    box-sizing: border-box;
-    display: flex;
-    align-items: center;
-    justify-content: space-evenly;
-
-    .save,
-    .close {
-      width: 100px;
-    }
-
-  }
-}
-
-.avatar-uploader .el-upload {
-  border: 1px dashed #d9d9d9;
-  border-radius: 6px;
-  cursor: pointer;
-  position: relative;
-  overflow: hidden;
-}
-
-.avatar-uploader .el-upload:hover {
-  border-color: #409EFF;
-}
-
-.avatar-uploader-icon {
-  font-size: 28px;
-  color: #8c939d;
-  width: 178px;
-  height: 178px;
-  line-height: 178px;
-  text-align: center;
-}
-
-.avatar {
-  width: 178px;
-  height: 178px;
-  display: block;
-}
-</style>
diff --git a/src/components/mycomponent/dialog/evaluateDialog.vue b/src/components/mycomponent/dialog/evaluateDialog.vue
deleted file mode 100644
index ba3ad75..0000000
--- a/src/components/mycomponent/dialog/evaluateDialog.vue
+++ /dev/null
@@ -1,365 +0,0 @@
-<!--季度评价弹窗-->
-<template>
-  <el-dialog title="季度评价" width="975px" :visible.sync="isShowInfo" append-to-body @close="close">
-    <div class="evaluateDialog">
-      <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.evaluateQuarterly" clearable placeholder="请选择" style="width:200px">
-                <el-option v-for="item in quarterOptions" :key="item.value" :label="item.label" :value="item.value" />
-              </el-select>
-            </input-vue>
-          </div>
-          <div class="inputBox">
-            <input-vue
-              v-model="addInfo.quarterlyEvaluateIllustration"
-              title="季度评价说明"
-              class="inputWidth"
-              placeholder="请输入季度评价说明"
-              width="200px"
-            />
-          </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">
-            <red-star />
-            <input-vue title="季度评价结果" class="inputWidth">
-              <el-select v-model="addInfo.quarterlyEvaluateResult" clearable placeholder="请选择" style="width:200px">
-                <el-option v-for="item in resultOptions" :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.quarterlyEvaluateDate"
-                placeholder="请选择日期"
-                suffix-icon="el-icon-date"
-                style="width:200px"
-              />
-            </input-vue>
-          </div>
-        </div>
-      </div>
-      <div class="imgContent">
-        <div class="img-box">
-          <div class="img-item">
-            <div v-if="fileName" class="title-box">
-              <div class="img-title">
-                {{ fileName }}
-              </div>
-              <div class="img-btn">
-                <el-button type="text" class="btn">
-                  下载
-                </el-button>
-              </div>
-            </div>
-            <el-upload
-              class="avatar-uploader"
-              :headers="myHeaders"
-              action="http://111.198.10.15:21403/file/uploadFile"
-              :show-file-list="false"
-              :on-success="handleAvatarSuccess"
-              :before-upload="beforeAvatarUpload"
-            >
-              <img v-if="imageUrl" :src="imageUrl" class="avatar">
-              <i v-else class="el-icon-plus avatar-uploader-icon" />
-            </el-upload>
-          </div>
-          <div class="img-item">
-            <div v-if="fileName2" class="title-box">
-              <div class="img-title">
-                {{ fileName2 }}
-              </div>
-              <div class="img-btn">
-                <el-button type="text" class="btn">
-                  下载
-                </el-button>
-              </div>
-            </div>
-            <el-upload
-              class="avatar-uploader"
-              :headers="myHeaders"
-              action="http://111.198.10.15:21403/file/uploadFile"
-              :show-file-list="false"
-              :on-success="handleAvatarSuccess2"
-              :before-upload="beforeAvatarUpload"
-            >
-              <img v-if="imageUrl2" :src="imageUrl2" class="avatar">
-              <i v-else class="el-icon-plus avatar-uploader-icon" />
-            </el-upload>
-          </div>
-        </div>
-        <div class="uploadbtn">
-          <el-button type="primary">
-            上传录库评审结果
-          </el-button>
-        </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 { getToken } from '@/utils/auth'
-import { Message } from 'element-ui'
-import { evaluateAdd } from '../../../api/supplier/supplier'
-
-export default {
-  components: { inputVue, dialogHeader, RedStar },
-  props: {
-    dataInfo: {
-      type: Object,
-      dataInfo: {}
-    }
-  },
-  data() {
-    return {
-      isShowInfo: true,
-      fileName: '',
-      imageUrl: '',
-      imageUrl2: '',
-      fileName2: '',
-      myHeaders: { token: getToken() },
-      quarterOptions: [
-        { label: '2021第一季度', value: '2021第一季度' },
-        { label: '2021第二季度', value: '2021第二季度' }
-      ],
-      resultOptions: [
-        { label: 'A', value: 'A' },
-        { label: 'B', value: 'B' },
-        { label: 'C', value: 'C' }
-      ],
-      addInfo: {
-        supplierCode: '',
-        supplierName: '',
-        evaluateQuarterly: '',
-        quarterlyEvaluateResult: '',
-        quarterlyEvaluateIllustration: '',
-        quarterlyEvaluateDate: '',
-        quarterlyEvaluateFile: ''
-      }
-    }
-  },
-  watch: {
-    dataInfo: {
-      handler(val) {
-        console.log(val)
-        if (val != '') {
-          const temp = { ...this.addInfo }
-          this.addInfo = {
-            supplierCode: val.supplierCode,
-            supplierName: val.supplierName,
-            evaluateQuarterly: temp.evaluateQuarterly,
-            quarterlyEvaluateResult: temp.quarterlyEvaluateResult,
-            quarterlyEvaluateIllustration: temp.quarterlyEvaluateIllustration,
-            quarterlyEvaluateDate: temp.quarterlyEvaluateDate,
-            quarterlyEvaluateFile: temp.quarterlyEvaluateFile
-          }
-          console.log(this.addInfo)
-        }
-      },
-      deep: true,
-      immediate: true
-    }
-  },
-  methods: {
-    close() {
-      this.$emit('close')
-    },
-    // 照片上传
-    handleAvatarSuccess(res, file) {
-      this.fileName = res.data.fileName
-      console.log(res, file)
-      this.imageUrl = URL.createObjectURL(file.raw)
-      console.log(this.addInfo.quarterlyEvaluateFile, 'this.addInfo.quarterlyEvaluateFile')
-      if (this.addInfo.quarterlyEvaluateFile == '') {
-        console.log('1')
-        this.addInfo.quarterlyEvaluateFile = res.data.fileId
-      } else {
-        console.log('2')
-        this.addInfo.quarterlyEvaluateFile = this.addInfo.quarterlyEvaluateFile + ',' + res.data.fileId
-      }
-      console.log(this.addInfo.quarterlyEvaluateFile)
-    },
-    handleAvatarSuccess2(res, file) {
-      this.fileName2 = res.data.fileName
-      console.log(res, file)
-      this.imageUrl2 = URL.createObjectURL(file.raw)
-      if (this.addInfo.quarterlyEvaluateFile == '') {
-        console.log('3')
-        this.addInfo.quarterlyEvaluateFile = res.data.fileId
-      } else {
-        console.log('4')
-        this.addInfo.quarterlyEvaluateFile = this.addInfo.quarterlyEvaluateFile + ',' + res.data.fileId
-      }
-      console.log(this.addInfo.quarterlyEvaluateFile)
-    },
-    beforeAvatarUpload(file) {
-      const isJPG = file.type === 'image/jpeg'
-      const isLt2M = file.size / 1024 / 1024 < 2
-
-      if (!isJPG) {
-        this.$message.error('上传头像图片只能是 JPG 格式!')
-      }
-      if (!isLt2M) {
-        this.$message.error('上传头像图片大小不能超过 2MB!')
-      }
-      return isJPG && isLt2M
-    },
-    save() {
-      evaluateAdd(this.addInfo).then(res => {
-        console.log(res)
-        if (!res.code) {
-          this.close()
-          Message.success('保存成功')
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style lang='scss' scoped>
-.evaluateDialog {
-  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: 600px;
-      height: 250px;
-      display: flex;
-      justify-content: space-between;
-      padding: 10px 40px;
-      border: 1px solid #000;
-
-      .img-item {
-        width: 178px;
-        height: 200px;
-
-        .title-box {
-          display: flex;
-          justify-content: space-between;
-
-          .img-title {
-            width: 150px;
-            white-space: nowrap;
-            overflow: hidden;
-            text-overflow: ellipsis;
-            margin-right: 20px;
-          }
-
-          .img-btn {
-            .btn {
-              padding: 0;
-            }
-          }
-        }
-      }
-    }
-  }
-
-  .btnBox {
-    padding: 30px;
-    box-sizing: border-box;
-    display: flex;
-    align-items: center;
-    justify-content: space-evenly;
-
-    .save,
-    .close {
-      width: 100px;
-    }
-
-  }
-}
-
-.avatar-uploader .el-upload {
-  border: 1px dashed #d9d9d9;
-  border-radius: 6px;
-  cursor: pointer;
-  position: relative;
-  overflow: hidden;
-}
-
-.avatar-uploader .el-upload:hover {
-  border-color: #409EFF;
-}
-
-.avatar-uploader-icon {
-  font-size: 28px;
-  color: #8c939d;
-  width: 178px;
-  height: 178px;
-  line-height: 178px;
-  text-align: center;
-}
-
-.avatar {
-  width: 178px;
-  height: 178px;
-  display: block;
-}
-</style>
diff --git a/src/components/mycomponent/dialog/historyAssessDialog.vue b/src/components/mycomponent/dialog/historyAssessDialog.vue
deleted file mode 100644
index 30a0c57..0000000
--- a/src/components/mycomponent/dialog/historyAssessDialog.vue
+++ /dev/null
@@ -1,146 +0,0 @@
-<!--历史考核弹窗-->
-<template>
-  <div class="historyAssessDialog dialog">
-    <dialog-header title="历史考核" @close="close" />
-    <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="assessAnnualName" label="考核年度" width="150" />
-        <el-table-column prop="annualAssessResultName" label="年度考核结果" width="150" />
-        <el-table-column prop="annualAssessIllustration" label="年度考核说明" width="150" />
-        <el-table-column prop="annualAssessDate" label="年度考核时间" width="150" />
-        <el-table-column prop="annualAssessFile" 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>
-</template>
-
-<script>
-import dialogHeader from './dialogHeader.vue'
-import inputVue from '../input/inputVue.vue'
-import RedStar from '../redStar.vue'
-
-import { historyAssess } from '../../../api/supplier/supplier'
-
-export default {
-  components: { inputVue, dialogHeader, RedStar },
-  props: {
-    dataInfo: {
-      type: Object,
-      dataInfo: {}
-    }
-  },
-  data() {
-    return {
-      tableData: []
-    }
-  },
-  mounted() {
-    this.getHistoryAssess()
-  },
-  methods: {
-    // 生成序号
-    indexMethod(index) {
-      return index + 1
-    },
-    // 合并表头
-    headerStyle({ row, column, rowIndex, columnIndex }) {
-      row[5].colSpan = 2 // 第三列的表头占据2个单元格
-      row[6].colSpan = 0
-      if (columnIndex === 6) {
-        return 'display: none'
-      }
-    },
-    close() {
-      this.$emit('close')
-    },
-    getHistoryAssess() {
-      historyAssess().then(res => {
-        console.log(res)
-        this.tableData = res
-      })
-    }
-  }
-}
-</script>
-
-<style lang='scss' scoped>
-.historyAssessDialog {
-  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 {
-    margin: 20px;
-  }
-
-}
-</style>
diff --git a/src/components/mycomponent/dialog/historyEvaluateDialog.vue b/src/components/mycomponent/dialog/historyEvaluateDialog.vue
deleted file mode 100644
index 8fce92f..0000000
--- a/src/components/mycomponent/dialog/historyEvaluateDialog.vue
+++ /dev/null
@@ -1,148 +0,0 @@
-<!--历史评价弹窗-->
-<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>
-</template>
-
-<script>
-import dialogHeader from './dialogHeader.vue'
-import inputVue from '../input/inputVue.vue'
-import RedStar from '../redStar.vue'
-
-import { historyEvaluate } from '../../../api/supplier/supplier'
-
-export default {
-  components: { inputVue, dialogHeader, RedStar },
-  props: {
-    dataInfo: {
-      type: Object,
-      dataInfo: {}
-    }
-  },
-  data() {
-    return {
-      isShowInfo: true,
-      tableData: []
-    }
-  },
-  mounted() {
-    this.getHistoryEvaluate()
-  },
-  methods: {
-    // 生成序号
-    indexMethod(index) {
-      return index + 1
-    },
-    // 合并表头
-    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)
-        this.tableData = res
-      })
-    }
-  }
-}
-</script>
-
-<style lang='scss' scoped>
-.historyEvaluateDialog {
-  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 {
-        display: flex;
-        justify-content: inherit;
-        align-items: center;
-      }
-    }
-
-  }
-
-  .Dialog-table {
-    margin: 20px;
-  }
-
-}
-</style>
diff --git a/src/views/supplier/assess.vue b/src/views/supplier/assess.vue
index 5315ce9..aa1b324 100644
--- a/src/views/supplier/assess.vue
+++ b/src/views/supplier/assess.vue
@@ -86,8 +86,8 @@
 
 <script>
 import GroupPage from '../../components/mycomponent/groupPage.vue'
-import assessDialog from '../../components/mycomponent/dialog/assessDialog.vue'
-import historyAssessDialog from '../../components/mycomponent/dialog/historyAssessDialog.vue'
+import assessDialog from './assessDialog.vue'
+import historyAssessDialog from './historyAssessDialog.vue'
 
 import { a_list } from '../../api/supplier/supplier'
 import { tableRowClassName } from '../../utils/myUtils/changeTableTr'
diff --git a/src/views/supplier/assessDialog.vue b/src/views/supplier/assessDialog.vue
new file mode 100644
index 0000000..fd4bc00
--- /dev/null
+++ b/src/views/supplier/assessDialog.vue
@@ -0,0 +1,368 @@
+<!--年度考核弹窗-->
+<template>
+  <el-dialog title="年度考核" width="975px" :visible.sync="isShowInfo" append-to-body @close="close">
+    <div class="assessDialog">
+      <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.assessAnnual" clearable placeholder="请选择" style="width:200px">
+                <el-option v-for="item in yearOptions" :key="item.value" :label="item.label" :value="item.value" />
+              </el-select>
+            </input-vue>
+          </div>
+          <div class="inputBox">
+            <input-vue
+              v-model="addInfo.annualAssessIllustration"
+              title="年度考核说明"
+              class="inputWidth"
+              placeholder="请输入年度考核说明"
+              width="200px"
+            />
+          </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">
+            <red-star />
+            <input-vue title="考核结果" class="inputWidth">
+              <el-select v-model="addInfo.annualAssessResult" clearable placeholder="请选择" style="width:200px">
+                <el-option v-for="item in resultOptions" :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.annualAssessDate"
+                placeholder="请选择日期"
+                suffix-icon="el-icon-date"
+                style="width:200px"
+              />
+            </input-vue>
+          </div>
+        </div>
+      </div>
+      <div class="imgContent">
+        <div class="img-box">
+          <div class="img-item">
+            <div v-if="fileName" class="title-box">
+              <div class="img-title">
+                {{ fileName }}
+              </div>
+              <div class="img-btn">
+                <el-button type="text" class="btn">
+                  下载
+                </el-button>
+              </div>
+            </div>
+            <el-upload
+              class="avatar-uploader"
+              :headers="myHeaders"
+              action="http://111.198.10.15:21403/file/uploadFile"
+              :show-file-list="false"
+              :on-success="handleAvatarSuccess"
+              :before-upload="beforeAvatarUpload"
+            >
+              <img v-if="imageUrl" :src="imageUrl" class="avatar">
+              <i v-else class="el-icon-plus avatar-uploader-icon" />
+            </el-upload>
+          </div>
+          <div class="img-item">
+            <div v-if="fileName2" class="title-box">
+              <div class="img-title">
+                {{ fileName2 }}
+              </div>
+              <div class="img-btn">
+                <el-button type="text" class="btn">
+                  下载
+                </el-button>
+              </div>
+            </div>
+            <el-upload
+              class="avatar-uploader"
+              :headers="myHeaders"
+              action="http://111.198.10.15:21403/file/uploadFile"
+              :show-file-list="false"
+              :on-success="handleAvatarSuccess2"
+              :before-upload="beforeAvatarUpload"
+            >
+              <img v-if="imageUrl2" :src="imageUrl2" class="avatar">
+              <i v-else class="el-icon-plus avatar-uploader-icon" />
+            </el-upload>
+          </div>
+        </div>
+        <div class="uploadbtn">
+          <el-button type="primary">
+            上传录库评审结果
+          </el-button>
+        </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 '../../components/mycomponent/dialog/dialogHeader.vue'
+import inputVue from '../../components/mycomponent/input/inputVue.vue'
+import RedStar from '../../components/mycomponent/redStar.vue'
+
+import { getToken } from '@/utils/auth'
+import { Message } from 'element-ui'
+import { assessAdd } from '../../api/supplier/supplier'
+export default {
+  name: 'AssessDialog',
+  components: { inputVue, dialogHeader, RedStar },
+  props: {
+    assessAnnualOpts: {
+      type: Array,
+      default() {
+        return []
+      },
+      required: true
+    }
+  },
+  data() {
+    return {
+      fileName: '',
+      imageUrl: '',
+      imageUrl2: '',
+      fileName2: '',
+      myHeaders: { token: getToken() },
+      isShowInfo: true,
+      yearOptions: [
+        { label: '2021', value: '2021' },
+        { label: '2022', value: '2022' }
+      ],
+      resultOptions: [
+        { label: 'A', value: 'A' },
+        { label: 'B', value: 'B' },
+        { label: 'C', value: 'C' }
+      ],
+      addInfo: {
+        supplierCode: '',
+        supplierName: '',
+        assessAnnual: '',
+        annualAssessResult: '',
+        annualAssessIllustration: '',
+        annualAssessDate: '',
+        annualAssessFile: ''
+      }
+    }
+  },
+  watch: {
+    dataInfo: {
+      handler(val) {
+        console.log(val)
+        if (val != '') {
+          const temp = { ...this.addInfo }
+          this.addInfo = {
+            supplierCode: val.supplierCode,
+            supplierName: val.supplierName,
+            assessAnnual: temp.assessAnnual,
+            annualAssessResult: temp.annualAssessResult,
+            annualAssessIllustration: temp.annualAssessIllustration,
+            annualAssessDate: temp.annualAssessDate,
+            annualAssessFile: temp.annualAssessFile
+          }
+          console.log(this.addInfo)
+        }
+      },
+      deep: true,
+      immediate: true
+    }
+  },
+  methods: {
+    close() {
+      this.$emit('close')
+    },
+    // 照片上传
+    handleAvatarSuccess(res, file) {
+      this.fileName = res.data.fileName
+      console.log(res, file)
+      this.imageUrl = URL.createObjectURL(file.raw)
+      console.log(this.addInfo.annualAssessFile, 'this.addInfo.annualAssessFile')
+      if (this.addInfo.annualAssessFile == '') {
+        console.log('1')
+        this.addInfo.annualAssessFile = res.data.fileId
+      } else {
+        console.log('2')
+        this.addInfo.annualAssessFile = this.addInfo.annualAssessFile + ',' + res.data.fileId
+      }
+      console.log(this.addInfo.annualAssessFile)
+    },
+    handleAvatarSuccess2(res, file) {
+      this.fileName2 = res.data.fileName
+      console.log(res, file)
+      this.imageUrl2 = URL.createObjectURL(file.raw)
+      if (this.addInfo.annualAssessFile == '') {
+        console.log('3')
+        this.addInfo.annualAssessFile = res.data.fileId
+      } else {
+        console.log('4')
+        this.addInfo.annualAssessFile = this.addInfo.annualAssessFile + ',' + res.data.fileId
+      }
+      console.log(this.addInfo.annualAssessFile)
+    },
+    beforeAvatarUpload(file) {
+      const isJPG = file.type === 'image/jpeg'
+      const isLt2M = file.size / 1024 / 1024 < 2
+
+      if (!isJPG) {
+        this.$message.error('上传头像图片只能是 JPG 格式!')
+      }
+      if (!isLt2M) {
+        this.$message.error('上传头像图片大小不能超过 2MB!')
+      }
+      return isJPG && isLt2M
+    },
+    save() {
+      assessAdd(this.addInfo).then(res => {
+        console.log(res)
+        if (!res.code) {
+          this.close()
+          Message.success('保存成功')
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style lang='scss' scoped>
+.assessDialog {
+  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: 600px;
+      height: 250px;
+      display: flex;
+      justify-content: space-between;
+      padding: 10px 40px;
+      border: 1px solid #000;
+
+      .img-item {
+        width: 178px;
+        height: 200px;
+
+        .title-box {
+          display: flex;
+          justify-content: space-between;
+
+          .img-title {
+            width: 150px;
+            white-space: nowrap;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            margin-right: 20px;
+          }
+
+          .img-btn {
+            .btn {
+              padding: 0;
+            }
+          }
+        }
+      }
+    }
+  }
+
+  .btnBox {
+    padding: 30px;
+    box-sizing: border-box;
+    display: flex;
+    align-items: center;
+    justify-content: space-evenly;
+
+    .save,
+    .close {
+      width: 100px;
+    }
+
+  }
+}
+
+.avatar-uploader .el-upload {
+  border: 1px dashed #d9d9d9;
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+}
+
+.avatar-uploader .el-upload:hover {
+  border-color: #409EFF;
+}
+
+.avatar-uploader-icon {
+  font-size: 28px;
+  color: #8c939d;
+  width: 178px;
+  height: 178px;
+  line-height: 178px;
+  text-align: center;
+}
+
+.avatar {
+  width: 178px;
+  height: 178px;
+  display: block;
+}
+</style>
diff --git a/src/views/supplier/evaluate.vue b/src/views/supplier/evaluate.vue
index f3ee896..7653a58 100644
--- a/src/views/supplier/evaluate.vue
+++ b/src/views/supplier/evaluate.vue
@@ -3,33 +3,26 @@
   <div class="evaluate">
     <div class="evaluate-inputs">
       供应商编号
-      <el-input
-        v-model="selectInfo.supplierCode"
-        style="width: 200px"
-        placeholder="请输入编号"
-        clearable
-        class="evaluate-input"
-      />
+      <el-input v-model="selectInfo.supplierCode" style="width: 200px" placeholder="请输入编号" clearable class="evaluate-input"/>
 
       供应商名称
-      <el-input
-        v-model="selectInfo.supplierName"
-        style="width: 200px"
-        placeholder="请输入供应商名称"
-        clearable
-        class="evaluate-input"
-      />
+      <el-input v-model="selectInfo.supplierName" style="width: 200px" placeholder="请输入供应商名称" clearable class="evaluate-input"/>
 
-      评价时间
-      <el-select
-        v-model="selectInfo.evaluateQuarterly"
-        class="evaluate-select"
-        filterable
-        placeholder="请选择结果"
-        style="width: 200px"
-      >
-        <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
+      年份
+      <el-select v-model="selectInfo.evaluateYear" class="evaluate-select" clearable placeholder="请选择年份" style="width: 150px">
+        <el-option v-for="item in evaluateAnnualOpts" :key="item.id" :label="item.name" :value="item.value" />
       </el-select>
+
+      季度
+      <el-select v-model="selectInfo.evaluateQuarterly" class="evaluate-select" clearable placeholder="请选择季度" style="width: 150px">
+        <el-option v-for="item in evaluateQuarterlyOpts" :key="item.id" :label="item.name" :value="item.value" />
+      </el-select>
+
+      评价结果
+      <el-select v-model="selectInfo.quarterlyEvaluateResult" class="evaluate-select" clearable placeholder="请选择评价结果" style="width: 150px">
+        <el-option v-for="item in evaluateResultOpts" :key="item.id" :label="item.name" :value="item.value" />
+      </el-select>
+
       <div class="evaluate-btns">
         <el-button type="primary" class="evaluate-button" @click="selectData">
           查询
@@ -51,14 +44,18 @@
         :row-style="{ 'text-align': 'center' }"
         style="width: 100%"
       >
-        <el-table-column type="index" label="序号" width="180" />
-        <el-table-column prop="supplierCode" label="供应商编号" width="180" />
-        <el-table-column prop="supplierName" label="供应商名称" />
-        <el-table-column prop="supplierStatusName" label="供应商状态" />
-        <el-table-column prop="evaluateQuarterlyName" label="最新季度评价" />
-        <el-table-column prop="quarterlyEvaluateResult" label="季度评价结果" />
-        <el-table-column prop="quarterlyEvaluateDate" label="季度评价日期" />
-        <el-table-column header-align="center" align="center" fixed="right" label="操作">
+        <el-table-column type="index" label="序号" width="100" />
+        <el-table-column prop="supplierCode" label="供应商编号" width="200" />
+        <el-table-column prop="supplierName" label="供应商名称" width="400" />
+        <el-table-column prop="supplierStatusName" label="供应商状态" width="100" />
+        <el-table-column label="最新评价季度">
+          <template v-if="scope.row.evaluateYearName !== ''" slot-scope="scope">
+            {{ scope.row.evaluateYearName }}年{{ scope.row.evaluateQuarterlyName }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="quarterlyEvaluateResultName" label="季度评价结果" width="150" />
+        <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)">
               历史评价
@@ -80,21 +77,29 @@
       />
     </div>
     <historyEvaluateDialog v-if="isShowHistoryDialog" :data-info="dataInfo" @close="evaluateHistoryDialogClose" />
-    <evaluateDialog v-if="isShowDialog" :data-info="dataInfo" @close="evaluateDialogClose" />
+    <evaluate-dialog
+      ref="evaluateDialog"
+                     @refreshList="selectData"
+                     :evaluate-annual-opts="evaluateAnnualOpts"
+                     :evaluate-quarterly-opts="evaluateQuarterlyOpts"
+                     :evaluate-result-opts="evaluateResultOpts"
+    />
   </div>
 </template>
 
 <script>
 import GroupPage from '../../components/mycomponent/groupPage.vue'
-import evaluateDialog from '../../components/mycomponent/dialog/evaluateDialog.vue'
-import historyEvaluateDialog from '../../components/mycomponent/dialog/historyEvaluateDialog.vue'
+import EvaluateDialog from '@/views/supplier/evaluateDialog'
+import historyEvaluateDialog from './historyEvaluateDialog.vue'
 
 import { e_list } from '../../api/supplier/supplier'
 import { tableRowClassName } from '../../utils/myUtils/changeTableTr'
 import { listMixin } from '../../utils/myUtils/mixins/listPage'
+import { getDictByCode } from '@/api/system/dict'
+
 export default { // 加入分页逻辑
   components: {
-    historyEvaluateDialog, evaluateDialog, GroupPage
+    historyEvaluateDialog, EvaluateDialog, GroupPage
   },
   mixins: [listMixin],
   data() {
@@ -105,18 +110,43 @@
       selectInfo: {
         supplierCode: '',
         supplierName: '',
-        evaluateQuarterly: ''
+        evaluateYear: '',
+        evaluateQuarterly: '',
+        quarterlyEvaluateResult: ''
       },
-      options: [
-        { label: '2022第一季度', value: '2022第一季度' },
-        { label: '2021第二季度', value: '2021第二季度' }
-      ]
+      evaluateAnnualOpts: [],
+      evaluateQuarterlyOpts: [],
+      evaluateResultOpts: []
     }
   },
   mounted() {
+    this.getDictEvaluateAnnual()
+    this.getDictEvaluateQuarterly()
+    this.getDictEvaluateResult()
   },
   methods: {
     tableRowClassName: tableRowClassName,
+    getDictEvaluateAnnual() {
+      getDictByCode('assessAnnual').then(response => {
+        if (response.code === 200) {
+          this.evaluateAnnualOpts = response.data
+        }
+      })
+    },
+    getDictEvaluateQuarterly() {
+      getDictByCode('evaluateQuarterly').then(response => {
+        if (response.code === 200) {
+          this.evaluateQuarterlyOpts = response.data
+        }
+      })
+    },
+    getDictEvaluateResult() {
+      getDictByCode('evaluateResult').then(response => {
+        if (response.code === 200) {
+          this.evaluateResultOpts = response.data
+        }
+      })
+    },
     hitstoryDialog(row) {
       this.dataInfo = row
       this.isShowHistoryDialog = true
@@ -128,10 +158,9 @@
       this.isShowDialog = false
     },
     evaluateDialogClick(row) {
-      this.dataInfo = row
-      this.isShowDialog = true
+      this.$refs.evaluateDialog.initDialog(row)
     },
-    getListPage(limit, offset) {
+    getListPage(limit = 10, offset = 1) {
       e_list(`limit=${limit}&offset=${offset}`, this.queryInfo).then(res => {
         console.log(res)
         this.tableData = res
@@ -141,7 +170,9 @@
       this.selectInfo = { // 搜索框中的数据的数据
         supplierCode: '',
         supplierName: '',
-        evaluateQuarterly: ''
+        evaluateYear: '',
+        evaluateQuarterly: '',
+        quarterlyEvaluateResult: ''
       }
     }
   }
@@ -166,7 +197,7 @@
   }
 
   .evaluate-select {
-    margin: 0 4rem 0 0.5rem;
+    margin: 0 1rem 0 0.5rem;
   }
 
   .evaluate-btns {
diff --git a/src/views/supplier/evaluateDialog.vue b/src/views/supplier/evaluateDialog.vue
new file mode 100644
index 0000000..b217191
--- /dev/null
+++ b/src/views/supplier/evaluateDialog.vue
@@ -0,0 +1,309 @@
+<!--季度评价弹窗-->
+<template>
+  <el-dialog title="季度评价" width="975px" :visible.sync="isShowInfo" append-to-body @close="close">
+    <el-form ref="evaluateForm" :model="addInfo" :rules="evaluateRules" 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="evaluateYear">
+            <el-select v-model="addInfo.evaluateYear" clearable placeholder="请选择年份" style="width: 100%">
+              <el-option v-for="item in evaluateAnnualOpts" :key="item.id" :label="item.name" :value="item.value" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="10">
+          <el-form-item label="季度" prop="evaluateQuarterly">
+            <el-select v-model="addInfo.evaluateQuarterly" clearable placeholder="请选择季度" style="width: 100%">
+              <el-option v-for="item in evaluateQuarterlyOpts" :key="item.id" :label="item.name" :value="item.value" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="10">
+          <el-form-item label="评审结果" prop="quarterlyEvaluateResult">
+            <el-select v-model="addInfo.quarterlyEvaluateResult" clearable placeholder="请选择评价结果" style="width: 100%">
+              <el-option v-for="item in evaluateResultOpts" :key="item.id" :label="item.name" :value="item.value" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="10">
+          <el-form-item label="评审日期" prop="quarterlyEvaluateDate">
+            <el-date-picker v-model="addInfo.quarterlyEvaluateDate" 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="评审结果说明">
+            <el-input v-model="addInfo.quarterlyEvaluateIllustration" 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="evaluateFile"
+              action="action"
+              :file-list="quarterlyEvaluateFileList"
+              :http-request="uploadQuarterlyEvaluateFile"
+              :before-upload="handleBeforeUpload"
+              :on-remove="handleQuarterlyEvaluateFileRemove"
+              :on-exceed="quarterlyEvaluateFileExceed"
+              :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="evaluateDialog">
+      <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 { evaluateAdd } from '@/api/supplier/supplier'
+import { Uploadimg } from '@/api/common'
+import { getToday } from '@/utils/dateutils'
+
+export default {
+  name: 'EvaluateDialog',
+  props: {
+    evaluateAnnualOpts: {
+      type: Array,
+      default() {
+        return []
+      },
+      required: true
+    },
+    evaluateQuarterlyOpts: {
+      type: Array,
+      default() {
+        return []
+      },
+      required: true
+    },
+    evaluateResultOpts: {
+      type: Array,
+      default() {
+        return []
+      },
+      required: true
+    }
+  },
+  data() {
+    return {
+      isShowInfo: false,
+      quarterOptions: [
+        { label: '2021第一季度', value: '2021第一季度' },
+        { label: '2021第二季度', value: '2021第二季度' }
+      ],
+      resultOptions: [
+        { label: 'A', value: 'A' },
+        { label: 'B', value: 'B' },
+        { label: 'C', value: 'C' }
+      ],
+      addInfo: {
+        supplierCode: '',
+        supplierName: '',
+        evaluateYear: '',
+        evaluateQuarterly: '',
+        quarterlyEvaluateResult: '',
+        quarterlyEvaluateIllustration: '',
+        quarterlyEvaluateDate: '',
+        quarterlyEvaluateFile: ''
+      },
+      evaluateRules: {
+        evaluateYear: [{ required: true, message: '请选择评价年份', trigger: 'change' }],
+        evaluateQuarterly: [{ required: true, message: '请选择评价季度', trigger: 'change' }],
+        quarterlyEvaluateResult: [{ required: true, message: '请选择评价结果', trigger: 'change' }],
+        quarterlyEvaluateDate: [{ required: true, message: '请选择评价日期', trigger: 'blur' }]
+      },
+      quarterlyEvaluateFileList: [],
+      evaluateValid: 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.quarterlyEvaluateDate = getToday('yyyy-MM-dd')
+      }
+    },
+    save() {
+      this.validateForm()
+      if (this.evaluateValid === true) {
+        if (this.quarterlyEvaluateFileList.length > 0) {
+          for (const i in this.quarterlyEvaluateFileList) {
+            this.addInfo.quarterlyEvaluateFile += this.quarterlyEvaluateFileList[i].url + ','
+          }
+
+          this.addInfo.quarterlyEvaluateFile = this.addInfo.quarterlyEvaluateFile.substring(0, this.addInfo.quarterlyEvaluateFile.length - 1)
+        }
+
+        evaluateAdd(this.addInfo).then(res => {
+          if (!res.code) {
+            this.$message.success('保存成功')
+            this.clearForm()
+            this.close()
+          }
+        })
+      }
+    },
+    validateForm: function() {
+      this.$refs.evaluateForm.validate(valid => {
+        this.evaluateValid = valid
+      })
+    },
+    clearForm() {
+      this.addInfo = {
+        supplierCode: '',
+        supplierName: '',
+        evaluateYear: '',
+        evaluateQuarterly: '',
+        quarterlyEvaluateResult: '',
+        quarterlyEvaluateIllustration: '',
+        quarterlyEvaluateDate: '',
+        quarterlyEvaluateFile: ''
+      }
+      this.quarterlyEvaluateFileList = []
+      // 清除验证
+      this.$nextTick(() => {
+        this.$refs.evaluateForm.clearValidate()
+      })
+    },
+    uploadQuarterlyEvaluateFile(file) {
+      // 判断文件是否已经上传过
+      for (const i in this.quarterlyEvaluateFileList) {
+        if (this.quarterlyEvaluateFileList[i].name === file.name) {
+          this.$message.error('该文件已上传过，请选择其他文件')
+          this.handleFileNotUploaded(file, this.$refs.evaluateFile.uploadFiles)
+          return
+        }
+      }
+
+      Uploadimg(file).then(res => {
+        if (res.code === 200) {
+          this.quarterlyEvaluateFileList.push({
+            name: res.data.fileName,
+            url: res.data.fileId,
+            type: file.file.type
+          })
+          this.$message.success('文件上传成功')
+        }
+      })
+    },
+    handleQuarterlyEvaluateFileRemove(file) {
+      this.handleRemove(file, this.quarterlyEvaluateFileList)
+    },
+    quarterlyEvaluateFileExceed(file, fileList) {
+      this.handleExceed(file, this.quarterlyEvaluateFileList)
+    },
+    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>
+.evaluateDialog {
+  width: 975px;
+  padding: 0 20px;
+  box-sizing: border-box;
+
+  .btnBox {
+    padding: 30px;
+    box-sizing: border-box;
+    display: flex;
+    align-items: center;
+    justify-content: space-evenly;
+
+    .save,
+    .close {
+      width: 200px;
+    }
+
+  }
+}
+</style>

diff --git a/src/api/supplier/supplier.js b/src/api/supplier/supplier.js
index 0fd037c..fe31ad0 100644
--- a/src/api/supplier/supplier.js
+++ b/src/api/supplier/supplier.js
@@ -48,7 +48,7 @@
 
 // 新增
 const evaluateAdd = (data) => {
-  return instance.post('/supplierInputReview/add', data)
+  return instance.post('/supplierQuarterlyEvaluate/add', data)
 }
 
 // 年度考核不分页列表
diff --git a/src/components/mycomponent/dialog/assessDialog.vue b/src/components/mycomponent/dialog/assessDialog.vue
deleted file mode 100644
index 5bb387d..0000000
--- a/src/components/mycomponent/dialog/assessDialog.vue
+++ /dev/null
@@ -1,364 +0,0 @@
-<!--年度考核弹窗-->
-<template>
-  <el-dialog title="年度考核" width="975px" :visible.sync="isShowInfo" append-to-body @close="close">
-    <div class="assessDialog">
-      <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.assessAnnual" clearable placeholder="请选择" style="width:200px">
-                <el-option v-for="item in yearOptions" :key="item.value" :label="item.label" :value="item.value" />
-              </el-select>
-            </input-vue>
-          </div>
-          <div class="inputBox">
-            <input-vue
-              v-model="addInfo.annualAssessIllustration"
-              title="年度考核说明"
-              class="inputWidth"
-              placeholder="请输入年度考核说明"
-              width="200px"
-            />
-          </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">
-            <red-star />
-            <input-vue title="考核结果" class="inputWidth">
-              <el-select v-model="addInfo.annualAssessResult" clearable placeholder="请选择" style="width:200px">
-                <el-option v-for="item in resultOptions" :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.annualAssessDate"
-                placeholder="请选择日期"
-                suffix-icon="el-icon-date"
-                style="width:200px"
-              />
-            </input-vue>
-          </div>
-        </div>
-      </div>
-      <div class="imgContent">
-        <div class="img-box">
-          <div class="img-item">
-            <div v-if="fileName" class="title-box">
-              <div class="img-title">
-                {{ fileName }}
-              </div>
-              <div class="img-btn">
-                <el-button type="text" class="btn">
-                  下载
-                </el-button>
-              </div>
-            </div>
-            <el-upload
-              class="avatar-uploader"
-              :headers="myHeaders"
-              action="http://111.198.10.15:21403/file/uploadFile"
-              :show-file-list="false"
-              :on-success="handleAvatarSuccess"
-              :before-upload="beforeAvatarUpload"
-            >
-              <img v-if="imageUrl" :src="imageUrl" class="avatar">
-              <i v-else class="el-icon-plus avatar-uploader-icon" />
-            </el-upload>
-          </div>
-          <div class="img-item">
-            <div v-if="fileName2" class="title-box">
-              <div class="img-title">
-                {{ fileName2 }}
-              </div>
-              <div class="img-btn">
-                <el-button type="text" class="btn">
-                  下载
-                </el-button>
-              </div>
-            </div>
-            <el-upload
-              class="avatar-uploader"
-              :headers="myHeaders"
-              action="http://111.198.10.15:21403/file/uploadFile"
-              :show-file-list="false"
-              :on-success="handleAvatarSuccess2"
-              :before-upload="beforeAvatarUpload"
-            >
-              <img v-if="imageUrl2" :src="imageUrl2" class="avatar">
-              <i v-else class="el-icon-plus avatar-uploader-icon" />
-            </el-upload>
-          </div>
-        </div>
-        <div class="uploadbtn">
-          <el-button type="primary">
-            上传录库评审结果
-          </el-button>
-        </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 { getToken } from '@/utils/auth'
-import { Message } from 'element-ui'
-import { assessAdd } from '../../../api/supplier/supplier'
-export default {
-  components: { inputVue, dialogHeader, RedStar },
-  props: {
-    dataInfo: {
-      type: Object,
-      dataInfo: {}
-    }
-  },
-  data() {
-    return {
-      fileName: '',
-      imageUrl: '',
-      imageUrl2: '',
-      fileName2: '',
-      myHeaders: { token: getToken() },
-      isShowInfo: true,
-      yearOptions: [
-        { label: '2021', value: '2021' },
-        { label: '2022', value: '2022' }
-      ],
-      resultOptions: [
-        { label: 'A', value: 'A' },
-        { label: 'B', value: 'B' },
-        { label: 'C', value: 'C' }
-      ],
-      addInfo: {
-        supplierCode: '',
-        supplierName: '',
-        assessAnnual: '',
-        annualAssessResult: '',
-        annualAssessIllustration: '',
-        annualAssessDate: '',
-        annualAssessFile: ''
-      }
-    }
-  },
-  watch: {
-    dataInfo: {
-      handler(val) {
-        console.log(val)
-        if (val != '') {
-          const temp = { ...this.addInfo }
-          this.addInfo = {
-            supplierCode: val.supplierCode,
-            supplierName: val.supplierName,
-            assessAnnual: temp.assessAnnual,
-            annualAssessResult: temp.annualAssessResult,
-            annualAssessIllustration: temp.annualAssessIllustration,
-            annualAssessDate: temp.annualAssessDate,
-            annualAssessFile: temp.annualAssessFile
-          }
-          console.log(this.addInfo)
-        }
-      },
-      deep: true,
-      immediate: true
-    }
-  },
-  methods: {
-    close() {
-      this.$emit('close')
-    },
-    // 照片上传
-    handleAvatarSuccess(res, file) {
-      this.fileName = res.data.fileName
-      console.log(res, file)
-      this.imageUrl = URL.createObjectURL(file.raw)
-      console.log(this.addInfo.annualAssessFile, 'this.addInfo.annualAssessFile')
-      if (this.addInfo.annualAssessFile == '') {
-        console.log('1')
-        this.addInfo.annualAssessFile = res.data.fileId
-      } else {
-        console.log('2')
-        this.addInfo.annualAssessFile = this.addInfo.annualAssessFile + ',' + res.data.fileId
-      }
-      console.log(this.addInfo.annualAssessFile)
-    },
-    handleAvatarSuccess2(res, file) {
-      this.fileName2 = res.data.fileName
-      console.log(res, file)
-      this.imageUrl2 = URL.createObjectURL(file.raw)
-      if (this.addInfo.annualAssessFile == '') {
-        console.log('3')
-        this.addInfo.annualAssessFile = res.data.fileId
-      } else {
-        console.log('4')
-        this.addInfo.annualAssessFile = this.addInfo.annualAssessFile + ',' + res.data.fileId
-      }
-      console.log(this.addInfo.annualAssessFile)
-    },
-    beforeAvatarUpload(file) {
-      const isJPG = file.type === 'image/jpeg'
-      const isLt2M = file.size / 1024 / 1024 < 2
-
-      if (!isJPG) {
-        this.$message.error('上传头像图片只能是 JPG 格式!')
-      }
-      if (!isLt2M) {
-        this.$message.error('上传头像图片大小不能超过 2MB!')
-      }
-      return isJPG && isLt2M
-    },
-    save() {
-      assessAdd(this.addInfo).then(res => {
-        console.log(res)
-        if (!res.code) {
-          this.close()
-          Message.success('保存成功')
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style lang='scss' scoped>
-.assessDialog {
-  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: 600px;
-      height: 250px;
-      display: flex;
-      justify-content: space-between;
-      padding: 10px 40px;
-      border: 1px solid #000;
-
-      .img-item {
-        width: 178px;
-        height: 200px;
-
-        .title-box {
-          display: flex;
-          justify-content: space-between;
-
-          .img-title {
-            width: 150px;
-            white-space: nowrap;
-            overflow: hidden;
-            text-overflow: ellipsis;
-            margin-right: 20px;
-          }
-
-          .img-btn {
-            .btn {
-              padding: 0;
-            }
-          }
-        }
-      }
-    }
-  }
-
-  .btnBox {
-    padding: 30px;
-    box-sizing: border-box;
-    display: flex;
-    align-items: center;
-    justify-content: space-evenly;
-
-    .save,
-    .close {
-      width: 100px;
-    }
-
-  }
-}
-
-.avatar-uploader .el-upload {
-  border: 1px dashed #d9d9d9;
-  border-radius: 6px;
-  cursor: pointer;
-  position: relative;
-  overflow: hidden;
-}
-
-.avatar-uploader .el-upload:hover {
-  border-color: #409EFF;
-}
-
-.avatar-uploader-icon {
-  font-size: 28px;
-  color: #8c939d;
-  width: 178px;
-  height: 178px;
-  line-height: 178px;
-  text-align: center;
-}
-
-.avatar {
-  width: 178px;
-  height: 178px;
-  display: block;
-}
-</style>
diff --git a/src/components/mycomponent/dialog/evaluateDialog.vue b/src/components/mycomponent/dialog/evaluateDialog.vue
deleted file mode 100644
index ba3ad75..0000000
--- a/src/components/mycomponent/dialog/evaluateDialog.vue
+++ /dev/null
@@ -1,365 +0,0 @@
-<!--季度评价弹窗-->
-<template>
-  <el-dialog title="季度评价" width="975px" :visible.sync="isShowInfo" append-to-body @close="close">
-    <div class="evaluateDialog">
-      <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.evaluateQuarterly" clearable placeholder="请选择" style="width:200px">
-                <el-option v-for="item in quarterOptions" :key="item.value" :label="item.label" :value="item.value" />
-              </el-select>
-            </input-vue>
-          </div>
-          <div class="inputBox">
-            <input-vue
-              v-model="addInfo.quarterlyEvaluateIllustration"
-              title="季度评价说明"
-              class="inputWidth"
-              placeholder="请输入季度评价说明"
-              width="200px"
-            />
-          </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">
-            <red-star />
-            <input-vue title="季度评价结果" class="inputWidth">
-              <el-select v-model="addInfo.quarterlyEvaluateResult" clearable placeholder="请选择" style="width:200px">
-                <el-option v-for="item in resultOptions" :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.quarterlyEvaluateDate"
-                placeholder="请选择日期"
-                suffix-icon="el-icon-date"
-                style="width:200px"
-              />
-            </input-vue>
-          </div>
-        </div>
-      </div>
-      <div class="imgContent">
-        <div class="img-box">
-          <div class="img-item">
-            <div v-if="fileName" class="title-box">
-              <div class="img-title">
-                {{ fileName }}
-              </div>
-              <div class="img-btn">
-                <el-button type="text" class="btn">
-                  下载
-                </el-button>
-              </div>
-            </div>
-            <el-upload
-              class="avatar-uploader"
-              :headers="myHeaders"
-              action="http://111.198.10.15:21403/file/uploadFile"
-              :show-file-list="false"
-              :on-success="handleAvatarSuccess"
-              :before-upload="beforeAvatarUpload"
-            >
-              <img v-if="imageUrl" :src="imageUrl" class="avatar">
-              <i v-else class="el-icon-plus avatar-uploader-icon" />
-            </el-upload>
-          </div>
-          <div class="img-item">
-            <div v-if="fileName2" class="title-box">
-              <div class="img-title">
-                {{ fileName2 }}
-              </div>
-              <div class="img-btn">
-                <el-button type="text" class="btn">
-                  下载
-                </el-button>
-              </div>
-            </div>
-            <el-upload
-              class="avatar-uploader"
-              :headers="myHeaders"
-              action="http://111.198.10.15:21403/file/uploadFile"
-              :show-file-list="false"
-              :on-success="handleAvatarSuccess2"
-              :before-upload="beforeAvatarUpload"
-            >
-              <img v-if="imageUrl2" :src="imageUrl2" class="avatar">
-              <i v-else class="el-icon-plus avatar-uploader-icon" />
-            </el-upload>
-          </div>
-        </div>
-        <div class="uploadbtn">
-          <el-button type="primary">
-            上传录库评审结果
-          </el-button>
-        </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 { getToken } from '@/utils/auth'
-import { Message } from 'element-ui'
-import { evaluateAdd } from '../../../api/supplier/supplier'
-
-export default {
-  components: { inputVue, dialogHeader, RedStar },
-  props: {
-    dataInfo: {
-      type: Object,
-      dataInfo: {}
-    }
-  },
-  data() {
-    return {
-      isShowInfo: true,
-      fileName: '',
-      imageUrl: '',
-      imageUrl2: '',
-      fileName2: '',
-      myHeaders: { token: getToken() },
-      quarterOptions: [
-        { label: '2021第一季度', value: '2021第一季度' },
-        { label: '2021第二季度', value: '2021第二季度' }
-      ],
-      resultOptions: [
-        { label: 'A', value: 'A' },
-        { label: 'B', value: 'B' },
-        { label: 'C', value: 'C' }
-      ],
-      addInfo: {
-        supplierCode: '',
-        supplierName: '',
-        evaluateQuarterly: '',
-        quarterlyEvaluateResult: '',
-        quarterlyEvaluateIllustration: '',
-        quarterlyEvaluateDate: '',
-        quarterlyEvaluateFile: ''
-      }
-    }
-  },
-  watch: {
-    dataInfo: {
-      handler(val) {
-        console.log(val)
-        if (val != '') {
-          const temp = { ...this.addInfo }
-          this.addInfo = {
-            supplierCode: val.supplierCode,
-            supplierName: val.supplierName,
-            evaluateQuarterly: temp.evaluateQuarterly,
-            quarterlyEvaluateResult: temp.quarterlyEvaluateResult,
-            quarterlyEvaluateIllustration: temp.quarterlyEvaluateIllustration,
-            quarterlyEvaluateDate: temp.quarterlyEvaluateDate,
-            quarterlyEvaluateFile: temp.quarterlyEvaluateFile
-          }
-          console.log(this.addInfo)
-        }
-      },
-      deep: true,
-      immediate: true
-    }
-  },
-  methods: {
-    close() {
-      this.$emit('close')
-    },
-    // 照片上传
-    handleAvatarSuccess(res, file) {
-      this.fileName = res.data.fileName
-      console.log(res, file)
-      this.imageUrl = URL.createObjectURL(file.raw)
-      console.log(this.addInfo.quarterlyEvaluateFile, 'this.addInfo.quarterlyEvaluateFile')
-      if (this.addInfo.quarterlyEvaluateFile == '') {
-        console.log('1')
-        this.addInfo.quarterlyEvaluateFile = res.data.fileId
-      } else {
-        console.log('2')
-        this.addInfo.quarterlyEvaluateFile = this.addInfo.quarterlyEvaluateFile + ',' + res.data.fileId
-      }
-      console.log(this.addInfo.quarterlyEvaluateFile)
-    },
-    handleAvatarSuccess2(res, file) {
-      this.fileName2 = res.data.fileName
-      console.log(res, file)
-      this.imageUrl2 = URL.createObjectURL(file.raw)
-      if (this.addInfo.quarterlyEvaluateFile == '') {
-        console.log('3')
-        this.addInfo.quarterlyEvaluateFile = res.data.fileId
-      } else {
-        console.log('4')
-        this.addInfo.quarterlyEvaluateFile = this.addInfo.quarterlyEvaluateFile + ',' + res.data.fileId
-      }
-      console.log(this.addInfo.quarterlyEvaluateFile)
-    },
-    beforeAvatarUpload(file) {
-      const isJPG = file.type === 'image/jpeg'
-      const isLt2M = file.size / 1024 / 1024 < 2
-
-      if (!isJPG) {
-        this.$message.error('上传头像图片只能是 JPG 格式!')
-      }
-      if (!isLt2M) {
-        this.$message.error('上传头像图片大小不能超过 2MB!')
-      }
-      return isJPG && isLt2M
-    },
-    save() {
-      evaluateAdd(this.addInfo).then(res => {
-        console.log(res)
-        if (!res.code) {
-          this.close()
-          Message.success('保存成功')
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style lang='scss' scoped>
-.evaluateDialog {
-  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: 600px;
-      height: 250px;
-      display: flex;
-      justify-content: space-between;
-      padding: 10px 40px;
-      border: 1px solid #000;
-
-      .img-item {
-        width: 178px;
-        height: 200px;
-
-        .title-box {
-          display: flex;
-          justify-content: space-between;
-
-          .img-title {
-            width: 150px;
-            white-space: nowrap;
-            overflow: hidden;
-            text-overflow: ellipsis;
-            margin-right: 20px;
-          }
-
-          .img-btn {
-            .btn {
-              padding: 0;
-            }
-          }
-        }
-      }
-    }
-  }
-
-  .btnBox {
-    padding: 30px;
-    box-sizing: border-box;
-    display: flex;
-    align-items: center;
-    justify-content: space-evenly;
-
-    .save,
-    .close {
-      width: 100px;
-    }
-
-  }
-}
-
-.avatar-uploader .el-upload {
-  border: 1px dashed #d9d9d9;
-  border-radius: 6px;
-  cursor: pointer;
-  position: relative;
-  overflow: hidden;
-}
-
-.avatar-uploader .el-upload:hover {
-  border-color: #409EFF;
-}
-
-.avatar-uploader-icon {
-  font-size: 28px;
-  color: #8c939d;
-  width: 178px;
-  height: 178px;
-  line-height: 178px;
-  text-align: center;
-}
-
-.avatar {
-  width: 178px;
-  height: 178px;
-  display: block;
-}
-</style>
diff --git a/src/components/mycomponent/dialog/historyAssessDialog.vue b/src/components/mycomponent/dialog/historyAssessDialog.vue
deleted file mode 100644
index 30a0c57..0000000
--- a/src/components/mycomponent/dialog/historyAssessDialog.vue
+++ /dev/null
@@ -1,146 +0,0 @@
-<!--历史考核弹窗-->
-<template>
-  <div class="historyAssessDialog dialog">
-    <dialog-header title="历史考核" @close="close" />
-    <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="assessAnnualName" label="考核年度" width="150" />
-        <el-table-column prop="annualAssessResultName" label="年度考核结果" width="150" />
-        <el-table-column prop="annualAssessIllustration" label="年度考核说明" width="150" />
-        <el-table-column prop="annualAssessDate" label="年度考核时间" width="150" />
-        <el-table-column prop="annualAssessFile" 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>
-</template>
-
-<script>
-import dialogHeader from './dialogHeader.vue'
-import inputVue from '../input/inputVue.vue'
-import RedStar from '../redStar.vue'
-
-import { historyAssess } from '../../../api/supplier/supplier'
-
-export default {
-  components: { inputVue, dialogHeader, RedStar },
-  props: {
-    dataInfo: {
-      type: Object,
-      dataInfo: {}
-    }
-  },
-  data() {
-    return {
-      tableData: []
-    }
-  },
-  mounted() {
-    this.getHistoryAssess()
-  },
-  methods: {
-    // 生成序号
-    indexMethod(index) {
-      return index + 1
-    },
-    // 合并表头
-    headerStyle({ row, column, rowIndex, columnIndex }) {
-      row[5].colSpan = 2 // 第三列的表头占据2个单元格
-      row[6].colSpan = 0
-      if (columnIndex === 6) {
-        return 'display: none'
-      }
-    },
-    close() {
-      this.$emit('close')
-    },
-    getHistoryAssess() {
-      historyAssess().then(res => {
-        console.log(res)
-        this.tableData = res
-      })
-    }
-  }
-}
-</script>
-
-<style lang='scss' scoped>
-.historyAssessDialog {
-  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 {
-    margin: 20px;
-  }
-
-}
-</style>
diff --git a/src/components/mycomponent/dialog/historyEvaluateDialog.vue b/src/components/mycomponent/dialog/historyEvaluateDialog.vue
deleted file mode 100644
index 8fce92f..0000000
--- a/src/components/mycomponent/dialog/historyEvaluateDialog.vue
+++ /dev/null
@@ -1,148 +0,0 @@
-<!--历史评价弹窗-->
-<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>
-</template>
-
-<script>
-import dialogHeader from './dialogHeader.vue'
-import inputVue from '../input/inputVue.vue'
-import RedStar from '../redStar.vue'
-
-import { historyEvaluate } from '../../../api/supplier/supplier'
-
-export default {
-  components: { inputVue, dialogHeader, RedStar },
-  props: {
-    dataInfo: {
-      type: Object,
-      dataInfo: {}
-    }
-  },
-  data() {
-    return {
-      isShowInfo: true,
-      tableData: []
-    }
-  },
-  mounted() {
-    this.getHistoryEvaluate()
-  },
-  methods: {
-    // 生成序号
-    indexMethod(index) {
-      return index + 1
-    },
-    // 合并表头
-    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)
-        this.tableData = res
-      })
-    }
-  }
-}
-</script>
-
-<style lang='scss' scoped>
-.historyEvaluateDialog {
-  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 {
-        display: flex;
-        justify-content: inherit;
-        align-items: center;
-      }
-    }
-
-  }
-
-  .Dialog-table {
-    margin: 20px;
-  }
-
-}
-</style>
diff --git a/src/views/supplier/assess.vue b/src/views/supplier/assess.vue
index 5315ce9..aa1b324 100644
--- a/src/views/supplier/assess.vue
+++ b/src/views/supplier/assess.vue
@@ -86,8 +86,8 @@
 
 <script>
 import GroupPage from '../../components/mycomponent/groupPage.vue'
-import assessDialog from '../../components/mycomponent/dialog/assessDialog.vue'
-import historyAssessDialog from '../../components/mycomponent/dialog/historyAssessDialog.vue'
+import assessDialog from './assessDialog.vue'
+import historyAssessDialog from './historyAssessDialog.vue'
 
 import { a_list } from '../../api/supplier/supplier'
 import { tableRowClassName } from '../../utils/myUtils/changeTableTr'
diff --git a/src/views/supplier/assessDialog.vue b/src/views/supplier/assessDialog.vue
new file mode 100644
index 0000000..fd4bc00
--- /dev/null
+++ b/src/views/supplier/assessDialog.vue
@@ -0,0 +1,368 @@
+<!--年度考核弹窗-->
+<template>
+  <el-dialog title="年度考核" width="975px" :visible.sync="isShowInfo" append-to-body @close="close">
+    <div class="assessDialog">
+      <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.assessAnnual" clearable placeholder="请选择" style="width:200px">
+                <el-option v-for="item in yearOptions" :key="item.value" :label="item.label" :value="item.value" />
+              </el-select>
+            </input-vue>
+          </div>
+          <div class="inputBox">
+            <input-vue
+              v-model="addInfo.annualAssessIllustration"
+              title="年度考核说明"
+              class="inputWidth"
+              placeholder="请输入年度考核说明"
+              width="200px"
+            />
+          </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">
+            <red-star />
+            <input-vue title="考核结果" class="inputWidth">
+              <el-select v-model="addInfo.annualAssessResult" clearable placeholder="请选择" style="width:200px">
+                <el-option v-for="item in resultOptions" :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.annualAssessDate"
+                placeholder="请选择日期"
+                suffix-icon="el-icon-date"
+                style="width:200px"
+              />
+            </input-vue>
+          </div>
+        </div>
+      </div>
+      <div class="imgContent">
+        <div class="img-box">
+          <div class="img-item">
+            <div v-if="fileName" class="title-box">
+              <div class="img-title">
+                {{ fileName }}
+              </div>
+              <div class="img-btn">
+                <el-button type="text" class="btn">
+                  下载
+                </el-button>
+              </div>
+            </div>
+            <el-upload
+              class="avatar-uploader"
+              :headers="myHeaders"
+              action="http://111.198.10.15:21403/file/uploadFile"
+              :show-file-list="false"
+              :on-success="handleAvatarSuccess"
+              :before-upload="beforeAvatarUpload"
+            >
+              <img v-if="imageUrl" :src="imageUrl" class="avatar">
+              <i v-else class="el-icon-plus avatar-uploader-icon" />
+            </el-upload>
+          </div>
+          <div class="img-item">
+            <div v-if="fileName2" class="title-box">
+              <div class="img-title">
+                {{ fileName2 }}
+              </div>
+              <div class="img-btn">
+                <el-button type="text" class="btn">
+                  下载
+                </el-button>
+              </div>
+            </div>
+            <el-upload
+              class="avatar-uploader"
+              :headers="myHeaders"
+              action="http://111.198.10.15:21403/file/uploadFile"
+              :show-file-list="false"
+              :on-success="handleAvatarSuccess2"
+              :before-upload="beforeAvatarUpload"
+            >
+              <img v-if="imageUrl2" :src="imageUrl2" class="avatar">
+              <i v-else class="el-icon-plus avatar-uploader-icon" />
+            </el-upload>
+          </div>
+        </div>
+        <div class="uploadbtn">
+          <el-button type="primary">
+            上传录库评审结果
+          </el-button>
+        </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 '../../components/mycomponent/dialog/dialogHeader.vue'
+import inputVue from '../../components/mycomponent/input/inputVue.vue'
+import RedStar from '../../components/mycomponent/redStar.vue'
+
+import { getToken } from '@/utils/auth'
+import { Message } from 'element-ui'
+import { assessAdd } from '../../api/supplier/supplier'
+export default {
+  name: 'AssessDialog',
+  components: { inputVue, dialogHeader, RedStar },
+  props: {
+    assessAnnualOpts: {
+      type: Array,
+      default() {
+        return []
+      },
+      required: true
+    }
+  },
+  data() {
+    return {
+      fileName: '',
+      imageUrl: '',
+      imageUrl2: '',
+      fileName2: '',
+      myHeaders: { token: getToken() },
+      isShowInfo: true,
+      yearOptions: [
+        { label: '2021', value: '2021' },
+        { label: '2022', value: '2022' }
+      ],
+      resultOptions: [
+        { label: 'A', value: 'A' },
+        { label: 'B', value: 'B' },
+        { label: 'C', value: 'C' }
+      ],
+      addInfo: {
+        supplierCode: '',
+        supplierName: '',
+        assessAnnual: '',
+        annualAssessResult: '',
+        annualAssessIllustration: '',
+        annualAssessDate: '',
+        annualAssessFile: ''
+      }
+    }
+  },
+  watch: {
+    dataInfo: {
+      handler(val) {
+        console.log(val)
+        if (val != '') {
+          const temp = { ...this.addInfo }
+          this.addInfo = {
+            supplierCode: val.supplierCode,
+            supplierName: val.supplierName,
+            assessAnnual: temp.assessAnnual,
+            annualAssessResult: temp.annualAssessResult,
+            annualAssessIllustration: temp.annualAssessIllustration,
+            annualAssessDate: temp.annualAssessDate,
+            annualAssessFile: temp.annualAssessFile
+          }
+          console.log(this.addInfo)
+        }
+      },
+      deep: true,
+      immediate: true
+    }
+  },
+  methods: {
+    close() {
+      this.$emit('close')
+    },
+    // 照片上传
+    handleAvatarSuccess(res, file) {
+      this.fileName = res.data.fileName
+      console.log(res, file)
+      this.imageUrl = URL.createObjectURL(file.raw)
+      console.log(this.addInfo.annualAssessFile, 'this.addInfo.annualAssessFile')
+      if (this.addInfo.annualAssessFile == '') {
+        console.log('1')
+        this.addInfo.annualAssessFile = res.data.fileId
+      } else {
+        console.log('2')
+        this.addInfo.annualAssessFile = this.addInfo.annualAssessFile + ',' + res.data.fileId
+      }
+      console.log(this.addInfo.annualAssessFile)
+    },
+    handleAvatarSuccess2(res, file) {
+      this.fileName2 = res.data.fileName
+      console.log(res, file)
+      this.imageUrl2 = URL.createObjectURL(file.raw)
+      if (this.addInfo.annualAssessFile == '') {
+        console.log('3')
+        this.addInfo.annualAssessFile = res.data.fileId
+      } else {
+        console.log('4')
+        this.addInfo.annualAssessFile = this.addInfo.annualAssessFile + ',' + res.data.fileId
+      }
+      console.log(this.addInfo.annualAssessFile)
+    },
+    beforeAvatarUpload(file) {
+      const isJPG = file.type === 'image/jpeg'
+      const isLt2M = file.size / 1024 / 1024 < 2
+
+      if (!isJPG) {
+        this.$message.error('上传头像图片只能是 JPG 格式!')
+      }
+      if (!isLt2M) {
+        this.$message.error('上传头像图片大小不能超过 2MB!')
+      }
+      return isJPG && isLt2M
+    },
+    save() {
+      assessAdd(this.addInfo).then(res => {
+        console.log(res)
+        if (!res.code) {
+          this.close()
+          Message.success('保存成功')
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style lang='scss' scoped>
+.assessDialog {
+  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: 600px;
+      height: 250px;
+      display: flex;
+      justify-content: space-between;
+      padding: 10px 40px;
+      border: 1px solid #000;
+
+      .img-item {
+        width: 178px;
+        height: 200px;
+
+        .title-box {
+          display: flex;
+          justify-content: space-between;
+
+          .img-title {
+            width: 150px;
+            white-space: nowrap;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            margin-right: 20px;
+          }
+
+          .img-btn {
+            .btn {
+              padding: 0;
+            }
+          }
+        }
+      }
+    }
+  }
+
+  .btnBox {
+    padding: 30px;
+    box-sizing: border-box;
+    display: flex;
+    align-items: center;
+    justify-content: space-evenly;
+
+    .save,
+    .close {
+      width: 100px;
+    }
+
+  }
+}
+
+.avatar-uploader .el-upload {
+  border: 1px dashed #d9d9d9;
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+}
+
+.avatar-uploader .el-upload:hover {
+  border-color: #409EFF;
+}
+
+.avatar-uploader-icon {
+  font-size: 28px;
+  color: #8c939d;
+  width: 178px;
+  height: 178px;
+  line-height: 178px;
+  text-align: center;
+}
+
+.avatar {
+  width: 178px;
+  height: 178px;
+  display: block;
+}
+</style>
diff --git a/src/views/supplier/evaluate.vue b/src/views/supplier/evaluate.vue
index f3ee896..7653a58 100644
--- a/src/views/supplier/evaluate.vue
+++ b/src/views/supplier/evaluate.vue
@@ -3,33 +3,26 @@
   <div class="evaluate">
     <div class="evaluate-inputs">
       供应商编号
-      <el-input
-        v-model="selectInfo.supplierCode"
-        style="width: 200px"
-        placeholder="请输入编号"
-        clearable
-        class="evaluate-input"
-      />
+      <el-input v-model="selectInfo.supplierCode" style="width: 200px" placeholder="请输入编号" clearable class="evaluate-input"/>
 
       供应商名称
-      <el-input
-        v-model="selectInfo.supplierName"
-        style="width: 200px"
-        placeholder="请输入供应商名称"
-        clearable
-        class="evaluate-input"
-      />
+      <el-input v-model="selectInfo.supplierName" style="width: 200px" placeholder="请输入供应商名称" clearable class="evaluate-input"/>
 
-      评价时间
-      <el-select
-        v-model="selectInfo.evaluateQuarterly"
-        class="evaluate-select"
-        filterable
-        placeholder="请选择结果"
-        style="width: 200px"
-      >
-        <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
+      年份
+      <el-select v-model="selectInfo.evaluateYear" class="evaluate-select" clearable placeholder="请选择年份" style="width: 150px">
+        <el-option v-for="item in evaluateAnnualOpts" :key="item.id" :label="item.name" :value="item.value" />
       </el-select>
+
+      季度
+      <el-select v-model="selectInfo.evaluateQuarterly" class="evaluate-select" clearable placeholder="请选择季度" style="width: 150px">
+        <el-option v-for="item in evaluateQuarterlyOpts" :key="item.id" :label="item.name" :value="item.value" />
+      </el-select>
+
+      评价结果
+      <el-select v-model="selectInfo.quarterlyEvaluateResult" class="evaluate-select" clearable placeholder="请选择评价结果" style="width: 150px">
+        <el-option v-for="item in evaluateResultOpts" :key="item.id" :label="item.name" :value="item.value" />
+      </el-select>
+
       <div class="evaluate-btns">
         <el-button type="primary" class="evaluate-button" @click="selectData">
           查询
@@ -51,14 +44,18 @@
         :row-style="{ 'text-align': 'center' }"
         style="width: 100%"
       >
-        <el-table-column type="index" label="序号" width="180" />
-        <el-table-column prop="supplierCode" label="供应商编号" width="180" />
-        <el-table-column prop="supplierName" label="供应商名称" />
-        <el-table-column prop="supplierStatusName" label="供应商状态" />
-        <el-table-column prop="evaluateQuarterlyName" label="最新季度评价" />
-        <el-table-column prop="quarterlyEvaluateResult" label="季度评价结果" />
-        <el-table-column prop="quarterlyEvaluateDate" label="季度评价日期" />
-        <el-table-column header-align="center" align="center" fixed="right" label="操作">
+        <el-table-column type="index" label="序号" width="100" />
+        <el-table-column prop="supplierCode" label="供应商编号" width="200" />
+        <el-table-column prop="supplierName" label="供应商名称" width="400" />
+        <el-table-column prop="supplierStatusName" label="供应商状态" width="100" />
+        <el-table-column label="最新评价季度">
+          <template v-if="scope.row.evaluateYearName !== ''" slot-scope="scope">
+            {{ scope.row.evaluateYearName }}年{{ scope.row.evaluateQuarterlyName }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="quarterlyEvaluateResultName" label="季度评价结果" width="150" />
+        <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)">
               历史评价
@@ -80,21 +77,29 @@
       />
     </div>
     <historyEvaluateDialog v-if="isShowHistoryDialog" :data-info="dataInfo" @close="evaluateHistoryDialogClose" />
-    <evaluateDialog v-if="isShowDialog" :data-info="dataInfo" @close="evaluateDialogClose" />
+    <evaluate-dialog
+      ref="evaluateDialog"
+                     @refreshList="selectData"
+                     :evaluate-annual-opts="evaluateAnnualOpts"
+                     :evaluate-quarterly-opts="evaluateQuarterlyOpts"
+                     :evaluate-result-opts="evaluateResultOpts"
+    />
   </div>
 </template>
 
 <script>
 import GroupPage from '../../components/mycomponent/groupPage.vue'
-import evaluateDialog from '../../components/mycomponent/dialog/evaluateDialog.vue'
-import historyEvaluateDialog from '../../components/mycomponent/dialog/historyEvaluateDialog.vue'
+import EvaluateDialog from '@/views/supplier/evaluateDialog'
+import historyEvaluateDialog from './historyEvaluateDialog.vue'
 
 import { e_list } from '../../api/supplier/supplier'
 import { tableRowClassName } from '../../utils/myUtils/changeTableTr'
 import { listMixin } from '../../utils/myUtils/mixins/listPage'
+import { getDictByCode } from '@/api/system/dict'
+
 export default { // 加入分页逻辑
   components: {
-    historyEvaluateDialog, evaluateDialog, GroupPage
+    historyEvaluateDialog, EvaluateDialog, GroupPage
   },
   mixins: [listMixin],
   data() {
@@ -105,18 +110,43 @@
       selectInfo: {
         supplierCode: '',
         supplierName: '',
-        evaluateQuarterly: ''
+        evaluateYear: '',
+        evaluateQuarterly: '',
+        quarterlyEvaluateResult: ''
       },
-      options: [
-        { label: '2022第一季度', value: '2022第一季度' },
-        { label: '2021第二季度', value: '2021第二季度' }
-      ]
+      evaluateAnnualOpts: [],
+      evaluateQuarterlyOpts: [],
+      evaluateResultOpts: []
     }
   },
   mounted() {
+    this.getDictEvaluateAnnual()
+    this.getDictEvaluateQuarterly()
+    this.getDictEvaluateResult()
   },
   methods: {
     tableRowClassName: tableRowClassName,
+    getDictEvaluateAnnual() {
+      getDictByCode('assessAnnual').then(response => {
+        if (response.code === 200) {
+          this.evaluateAnnualOpts = response.data
+        }
+      })
+    },
+    getDictEvaluateQuarterly() {
+      getDictByCode('evaluateQuarterly').then(response => {
+        if (response.code === 200) {
+          this.evaluateQuarterlyOpts = response.data
+        }
+      })
+    },
+    getDictEvaluateResult() {
+      getDictByCode('evaluateResult').then(response => {
+        if (response.code === 200) {
+          this.evaluateResultOpts = response.data
+        }
+      })
+    },
     hitstoryDialog(row) {
       this.dataInfo = row
       this.isShowHistoryDialog = true
@@ -128,10 +158,9 @@
       this.isShowDialog = false
     },
     evaluateDialogClick(row) {
-      this.dataInfo = row
-      this.isShowDialog = true
+      this.$refs.evaluateDialog.initDialog(row)
     },
-    getListPage(limit, offset) {
+    getListPage(limit = 10, offset = 1) {
       e_list(`limit=${limit}&offset=${offset}`, this.queryInfo).then(res => {
         console.log(res)
         this.tableData = res
@@ -141,7 +170,9 @@
       this.selectInfo = { // 搜索框中的数据的数据
         supplierCode: '',
         supplierName: '',
-        evaluateQuarterly: ''
+        evaluateYear: '',
+        evaluateQuarterly: '',
+        quarterlyEvaluateResult: ''
       }
     }
   }
@@ -166,7 +197,7 @@
   }
 
   .evaluate-select {
-    margin: 0 4rem 0 0.5rem;
+    margin: 0 1rem 0 0.5rem;
   }
 
   .evaluate-btns {
diff --git a/src/views/supplier/evaluateDialog.vue b/src/views/supplier/evaluateDialog.vue
new file mode 100644
index 0000000..b217191
--- /dev/null
+++ b/src/views/supplier/evaluateDialog.vue
@@ -0,0 +1,309 @@
+<!--季度评价弹窗-->
+<template>
+  <el-dialog title="季度评价" width="975px" :visible.sync="isShowInfo" append-to-body @close="close">
+    <el-form ref="evaluateForm" :model="addInfo" :rules="evaluateRules" 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="evaluateYear">
+            <el-select v-model="addInfo.evaluateYear" clearable placeholder="请选择年份" style="width: 100%">
+              <el-option v-for="item in evaluateAnnualOpts" :key="item.id" :label="item.name" :value="item.value" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="10">
+          <el-form-item label="季度" prop="evaluateQuarterly">
+            <el-select v-model="addInfo.evaluateQuarterly" clearable placeholder="请选择季度" style="width: 100%">
+              <el-option v-for="item in evaluateQuarterlyOpts" :key="item.id" :label="item.name" :value="item.value" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="10">
+          <el-form-item label="评审结果" prop="quarterlyEvaluateResult">
+            <el-select v-model="addInfo.quarterlyEvaluateResult" clearable placeholder="请选择评价结果" style="width: 100%">
+              <el-option v-for="item in evaluateResultOpts" :key="item.id" :label="item.name" :value="item.value" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="10">
+          <el-form-item label="评审日期" prop="quarterlyEvaluateDate">
+            <el-date-picker v-model="addInfo.quarterlyEvaluateDate" 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="评审结果说明">
+            <el-input v-model="addInfo.quarterlyEvaluateIllustration" 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="evaluateFile"
+              action="action"
+              :file-list="quarterlyEvaluateFileList"
+              :http-request="uploadQuarterlyEvaluateFile"
+              :before-upload="handleBeforeUpload"
+              :on-remove="handleQuarterlyEvaluateFileRemove"
+              :on-exceed="quarterlyEvaluateFileExceed"
+              :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="evaluateDialog">
+      <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 { evaluateAdd } from '@/api/supplier/supplier'
+import { Uploadimg } from '@/api/common'
+import { getToday } from '@/utils/dateutils'
+
+export default {
+  name: 'EvaluateDialog',
+  props: {
+    evaluateAnnualOpts: {
+      type: Array,
+      default() {
+        return []
+      },
+      required: true
+    },
+    evaluateQuarterlyOpts: {
+      type: Array,
+      default() {
+        return []
+      },
+      required: true
+    },
+    evaluateResultOpts: {
+      type: Array,
+      default() {
+        return []
+      },
+      required: true
+    }
+  },
+  data() {
+    return {
+      isShowInfo: false,
+      quarterOptions: [
+        { label: '2021第一季度', value: '2021第一季度' },
+        { label: '2021第二季度', value: '2021第二季度' }
+      ],
+      resultOptions: [
+        { label: 'A', value: 'A' },
+        { label: 'B', value: 'B' },
+        { label: 'C', value: 'C' }
+      ],
+      addInfo: {
+        supplierCode: '',
+        supplierName: '',
+        evaluateYear: '',
+        evaluateQuarterly: '',
+        quarterlyEvaluateResult: '',
+        quarterlyEvaluateIllustration: '',
+        quarterlyEvaluateDate: '',
+        quarterlyEvaluateFile: ''
+      },
+      evaluateRules: {
+        evaluateYear: [{ required: true, message: '请选择评价年份', trigger: 'change' }],
+        evaluateQuarterly: [{ required: true, message: '请选择评价季度', trigger: 'change' }],
+        quarterlyEvaluateResult: [{ required: true, message: '请选择评价结果', trigger: 'change' }],
+        quarterlyEvaluateDate: [{ required: true, message: '请选择评价日期', trigger: 'blur' }]
+      },
+      quarterlyEvaluateFileList: [],
+      evaluateValid: 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.quarterlyEvaluateDate = getToday('yyyy-MM-dd')
+      }
+    },
+    save() {
+      this.validateForm()
+      if (this.evaluateValid === true) {
+        if (this.quarterlyEvaluateFileList.length > 0) {
+          for (const i in this.quarterlyEvaluateFileList) {
+            this.addInfo.quarterlyEvaluateFile += this.quarterlyEvaluateFileList[i].url + ','
+          }
+
+          this.addInfo.quarterlyEvaluateFile = this.addInfo.quarterlyEvaluateFile.substring(0, this.addInfo.quarterlyEvaluateFile.length - 1)
+        }
+
+        evaluateAdd(this.addInfo).then(res => {
+          if (!res.code) {
+            this.$message.success('保存成功')
+            this.clearForm()
+            this.close()
+          }
+        })
+      }
+    },
+    validateForm: function() {
+      this.$refs.evaluateForm.validate(valid => {
+        this.evaluateValid = valid
+      })
+    },
+    clearForm() {
+      this.addInfo = {
+        supplierCode: '',
+        supplierName: '',
+        evaluateYear: '',
+        evaluateQuarterly: '',
+        quarterlyEvaluateResult: '',
+        quarterlyEvaluateIllustration: '',
+        quarterlyEvaluateDate: '',
+        quarterlyEvaluateFile: ''
+      }
+      this.quarterlyEvaluateFileList = []
+      // 清除验证
+      this.$nextTick(() => {
+        this.$refs.evaluateForm.clearValidate()
+      })
+    },
+    uploadQuarterlyEvaluateFile(file) {
+      // 判断文件是否已经上传过
+      for (const i in this.quarterlyEvaluateFileList) {
+        if (this.quarterlyEvaluateFileList[i].name === file.name) {
+          this.$message.error('该文件已上传过，请选择其他文件')
+          this.handleFileNotUploaded(file, this.$refs.evaluateFile.uploadFiles)
+          return
+        }
+      }
+
+      Uploadimg(file).then(res => {
+        if (res.code === 200) {
+          this.quarterlyEvaluateFileList.push({
+            name: res.data.fileName,
+            url: res.data.fileId,
+            type: file.file.type
+          })
+          this.$message.success('文件上传成功')
+        }
+      })
+    },
+    handleQuarterlyEvaluateFileRemove(file) {
+      this.handleRemove(file, this.quarterlyEvaluateFileList)
+    },
+    quarterlyEvaluateFileExceed(file, fileList) {
+      this.handleExceed(file, this.quarterlyEvaluateFileList)
+    },
+    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>
+.evaluateDialog {
+  width: 975px;
+  padding: 0 20px;
+  box-sizing: border-box;
+
+  .btnBox {
+    padding: 30px;
+    box-sizing: border-box;
+    display: flex;
+    align-items: center;
+    justify-content: space-evenly;
+
+    .save,
+    .close {
+      width: 200px;
+    }
+
+  }
+}
+</style>
diff --git a/src/views/supplier/historyAssessDialog.vue b/src/views/supplier/historyAssessDialog.vue
new file mode 100644
index 0000000..83694dd
--- /dev/null
+++ b/src/views/supplier/historyAssessDialog.vue
@@ -0,0 +1,146 @@
+<!--历史考核弹窗-->
+<template>
+  <div class="historyAssessDialog dialog">
+    <dialog-header title="历史考核" @close="close" />
+    <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="assessAnnualName" label="考核年度" width="150" />
+        <el-table-column prop="annualAssessResultName" label="年度考核结果" width="150" />
+        <el-table-column prop="annualAssessIllustration" label="年度考核说明" width="150" />
+        <el-table-column prop="annualAssessDate" label="年度考核时间" width="150" />
+        <el-table-column prop="annualAssessFile" 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>
+</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 { historyAssess } from '../../api/supplier/supplier'
+
+export default {
+  components: { inputVue, dialogHeader, RedStar },
+  props: {
+    dataInfo: {
+      type: Object,
+      dataInfo: {}
+    }
+  },
+  data() {
+    return {
+      tableData: []
+    }
+  },
+  mounted() {
+    this.getHistoryAssess()
+  },
+  methods: {
+    // 生成序号
+    indexMethod(index) {
+      return index + 1
+    },
+    // 合并表头
+    headerStyle({ row, column, rowIndex, columnIndex }) {
+      row[5].colSpan = 2 // 第三列的表头占据2个单元格
+      row[6].colSpan = 0
+      if (columnIndex === 6) {
+        return 'display: none'
+      }
+    },
+    close() {
+      this.$emit('close')
+    },
+    getHistoryAssess() {
+      historyAssess().then(res => {
+        console.log(res)
+        this.tableData = res
+      })
+    }
+  }
+}
+</script>
+
+<style lang='scss' scoped>
+.historyAssessDialog {
+  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 {
+    margin: 20px;
+  }
+
+}
+</style>

diff --git a/src/api/supplier/supplier.js b/src/api/supplier/supplier.js
index 0fd037c..fe31ad0 100644
--- a/src/api/supplier/supplier.js
+++ b/src/api/supplier/supplier.js
@@ -48,7 +48,7 @@
 
 // 新增
 const evaluateAdd = (data) => {
-  return instance.post('/supplierInputReview/add', data)
+  return instance.post('/supplierQuarterlyEvaluate/add', data)
 }
 
 // 年度考核不分页列表
diff --git a/src/components/mycomponent/dialog/assessDialog.vue b/src/components/mycomponent/dialog/assessDialog.vue
deleted file mode 100644
index 5bb387d..0000000
--- a/src/components/mycomponent/dialog/assessDialog.vue
+++ /dev/null
@@ -1,364 +0,0 @@
-<!--年度考核弹窗-->
-<template>
-  <el-dialog title="年度考核" width="975px" :visible.sync="isShowInfo" append-to-body @close="close">
-    <div class="assessDialog">
-      <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.assessAnnual" clearable placeholder="请选择" style="width:200px">
-                <el-option v-for="item in yearOptions" :key="item.value" :label="item.label" :value="item.value" />
-              </el-select>
-            </input-vue>
-          </div>
-          <div class="inputBox">
-            <input-vue
-              v-model="addInfo.annualAssessIllustration"
-              title="年度考核说明"
-              class="inputWidth"
-              placeholder="请输入年度考核说明"
-              width="200px"
-            />
-          </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">
-            <red-star />
-            <input-vue title="考核结果" class="inputWidth">
-              <el-select v-model="addInfo.annualAssessResult" clearable placeholder="请选择" style="width:200px">
-                <el-option v-for="item in resultOptions" :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.annualAssessDate"
-                placeholder="请选择日期"
-                suffix-icon="el-icon-date"
-                style="width:200px"
-              />
-            </input-vue>
-          </div>
-        </div>
-      </div>
-      <div class="imgContent">
-        <div class="img-box">
-          <div class="img-item">
-            <div v-if="fileName" class="title-box">
-              <div class="img-title">
-                {{ fileName }}
-              </div>
-              <div class="img-btn">
-                <el-button type="text" class="btn">
-                  下载
-                </el-button>
-              </div>
-            </div>
-            <el-upload
-              class="avatar-uploader"
-              :headers="myHeaders"
-              action="http://111.198.10.15:21403/file/uploadFile"
-              :show-file-list="false"
-              :on-success="handleAvatarSuccess"
-              :before-upload="beforeAvatarUpload"
-            >
-              <img v-if="imageUrl" :src="imageUrl" class="avatar">
-              <i v-else class="el-icon-plus avatar-uploader-icon" />
-            </el-upload>
-          </div>
-          <div class="img-item">
-            <div v-if="fileName2" class="title-box">
-              <div class="img-title">
-                {{ fileName2 }}
-              </div>
-              <div class="img-btn">
-                <el-button type="text" class="btn">
-                  下载
-                </el-button>
-              </div>
-            </div>
-            <el-upload
-              class="avatar-uploader"
-              :headers="myHeaders"
-              action="http://111.198.10.15:21403/file/uploadFile"
-              :show-file-list="false"
-              :on-success="handleAvatarSuccess2"
-              :before-upload="beforeAvatarUpload"
-            >
-              <img v-if="imageUrl2" :src="imageUrl2" class="avatar">
-              <i v-else class="el-icon-plus avatar-uploader-icon" />
-            </el-upload>
-          </div>
-        </div>
-        <div class="uploadbtn">
-          <el-button type="primary">
-            上传录库评审结果
-          </el-button>
-        </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 { getToken } from '@/utils/auth'
-import { Message } from 'element-ui'
-import { assessAdd } from '../../../api/supplier/supplier'
-export default {
-  components: { inputVue, dialogHeader, RedStar },
-  props: {
-    dataInfo: {
-      type: Object,
-      dataInfo: {}
-    }
-  },
-  data() {
-    return {
-      fileName: '',
-      imageUrl: '',
-      imageUrl2: '',
-      fileName2: '',
-      myHeaders: { token: getToken() },
-      isShowInfo: true,
-      yearOptions: [
-        { label: '2021', value: '2021' },
-        { label: '2022', value: '2022' }
-      ],
-      resultOptions: [
-        { label: 'A', value: 'A' },
-        { label: 'B', value: 'B' },
-        { label: 'C', value: 'C' }
-      ],
-      addInfo: {
-        supplierCode: '',
-        supplierName: '',
-        assessAnnual: '',
-        annualAssessResult: '',
-        annualAssessIllustration: '',
-        annualAssessDate: '',
-        annualAssessFile: ''
-      }
-    }
-  },
-  watch: {
-    dataInfo: {
-      handler(val) {
-        console.log(val)
-        if (val != '') {
-          const temp = { ...this.addInfo }
-          this.addInfo = {
-            supplierCode: val.supplierCode,
-            supplierName: val.supplierName,
-            assessAnnual: temp.assessAnnual,
-            annualAssessResult: temp.annualAssessResult,
-            annualAssessIllustration: temp.annualAssessIllustration,
-            annualAssessDate: temp.annualAssessDate,
-            annualAssessFile: temp.annualAssessFile
-          }
-          console.log(this.addInfo)
-        }
-      },
-      deep: true,
-      immediate: true
-    }
-  },
-  methods: {
-    close() {
-      this.$emit('close')
-    },
-    // 照片上传
-    handleAvatarSuccess(res, file) {
-      this.fileName = res.data.fileName
-      console.log(res, file)
-      this.imageUrl = URL.createObjectURL(file.raw)
-      console.log(this.addInfo.annualAssessFile, 'this.addInfo.annualAssessFile')
-      if (this.addInfo.annualAssessFile == '') {
-        console.log('1')
-        this.addInfo.annualAssessFile = res.data.fileId
-      } else {
-        console.log('2')
-        this.addInfo.annualAssessFile = this.addInfo.annualAssessFile + ',' + res.data.fileId
-      }
-      console.log(this.addInfo.annualAssessFile)
-    },
-    handleAvatarSuccess2(res, file) {
-      this.fileName2 = res.data.fileName
-      console.log(res, file)
-      this.imageUrl2 = URL.createObjectURL(file.raw)
-      if (this.addInfo.annualAssessFile == '') {
-        console.log('3')
-        this.addInfo.annualAssessFile = res.data.fileId
-      } else {
-        console.log('4')
-        this.addInfo.annualAssessFile = this.addInfo.annualAssessFile + ',' + res.data.fileId
-      }
-      console.log(this.addInfo.annualAssessFile)
-    },
-    beforeAvatarUpload(file) {
-      const isJPG = file.type === 'image/jpeg'
-      const isLt2M = file.size / 1024 / 1024 < 2
-
-      if (!isJPG) {
-        this.$message.error('上传头像图片只能是 JPG 格式!')
-      }
-      if (!isLt2M) {
-        this.$message.error('上传头像图片大小不能超过 2MB!')
-      }
-      return isJPG && isLt2M
-    },
-    save() {
-      assessAdd(this.addInfo).then(res => {
-        console.log(res)
-        if (!res.code) {
-          this.close()
-          Message.success('保存成功')
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style lang='scss' scoped>
-.assessDialog {
-  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: 600px;
-      height: 250px;
-      display: flex;
-      justify-content: space-between;
-      padding: 10px 40px;
-      border: 1px solid #000;
-
-      .img-item {
-        width: 178px;
-        height: 200px;
-
-        .title-box {
-          display: flex;
-          justify-content: space-between;
-
-          .img-title {
-            width: 150px;
-            white-space: nowrap;
-            overflow: hidden;
-            text-overflow: ellipsis;
-            margin-right: 20px;
-          }
-
-          .img-btn {
-            .btn {
-              padding: 0;
-            }
-          }
-        }
-      }
-    }
-  }
-
-  .btnBox {
-    padding: 30px;
-    box-sizing: border-box;
-    display: flex;
-    align-items: center;
-    justify-content: space-evenly;
-
-    .save,
-    .close {
-      width: 100px;
-    }
-
-  }
-}
-
-.avatar-uploader .el-upload {
-  border: 1px dashed #d9d9d9;
-  border-radius: 6px;
-  cursor: pointer;
-  position: relative;
-  overflow: hidden;
-}
-
-.avatar-uploader .el-upload:hover {
-  border-color: #409EFF;
-}
-
-.avatar-uploader-icon {
-  font-size: 28px;
-  color: #8c939d;
-  width: 178px;
-  height: 178px;
-  line-height: 178px;
-  text-align: center;
-}
-
-.avatar {
-  width: 178px;
-  height: 178px;
-  display: block;
-}
-</style>
diff --git a/src/components/mycomponent/dialog/evaluateDialog.vue b/src/components/mycomponent/dialog/evaluateDialog.vue
deleted file mode 100644
index ba3ad75..0000000
--- a/src/components/mycomponent/dialog/evaluateDialog.vue
+++ /dev/null
@@ -1,365 +0,0 @@
-<!--季度评价弹窗-->
-<template>
-  <el-dialog title="季度评价" width="975px" :visible.sync="isShowInfo" append-to-body @close="close">
-    <div class="evaluateDialog">
-      <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.evaluateQuarterly" clearable placeholder="请选择" style="width:200px">
-                <el-option v-for="item in quarterOptions" :key="item.value" :label="item.label" :value="item.value" />
-              </el-select>
-            </input-vue>
-          </div>
-          <div class="inputBox">
-            <input-vue
-              v-model="addInfo.quarterlyEvaluateIllustration"
-              title="季度评价说明"
-              class="inputWidth"
-              placeholder="请输入季度评价说明"
-              width="200px"
-            />
-          </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">
-            <red-star />
-            <input-vue title="季度评价结果" class="inputWidth">
-              <el-select v-model="addInfo.quarterlyEvaluateResult" clearable placeholder="请选择" style="width:200px">
-                <el-option v-for="item in resultOptions" :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.quarterlyEvaluateDate"
-                placeholder="请选择日期"
-                suffix-icon="el-icon-date"
-                style="width:200px"
-              />
-            </input-vue>
-          </div>
-        </div>
-      </div>
-      <div class="imgContent">
-        <div class="img-box">
-          <div class="img-item">
-            <div v-if="fileName" class="title-box">
-              <div class="img-title">
-                {{ fileName }}
-              </div>
-              <div class="img-btn">
-                <el-button type="text" class="btn">
-                  下载
-                </el-button>
-              </div>
-            </div>
-            <el-upload
-              class="avatar-uploader"
-              :headers="myHeaders"
-              action="http://111.198.10.15:21403/file/uploadFile"
-              :show-file-list="false"
-              :on-success="handleAvatarSuccess"
-              :before-upload="beforeAvatarUpload"
-            >
-              <img v-if="imageUrl" :src="imageUrl" class="avatar">
-              <i v-else class="el-icon-plus avatar-uploader-icon" />
-            </el-upload>
-          </div>
-          <div class="img-item">
-            <div v-if="fileName2" class="title-box">
-              <div class="img-title">
-                {{ fileName2 }}
-              </div>
-              <div class="img-btn">
-                <el-button type="text" class="btn">
-                  下载
-                </el-button>
-              </div>
-            </div>
-            <el-upload
-              class="avatar-uploader"
-              :headers="myHeaders"
-              action="http://111.198.10.15:21403/file/uploadFile"
-              :show-file-list="false"
-              :on-success="handleAvatarSuccess2"
-              :before-upload="beforeAvatarUpload"
-            >
-              <img v-if="imageUrl2" :src="imageUrl2" class="avatar">
-              <i v-else class="el-icon-plus avatar-uploader-icon" />
-            </el-upload>
-          </div>
-        </div>
-        <div class="uploadbtn">
-          <el-button type="primary">
-            上传录库评审结果
-          </el-button>
-        </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 { getToken } from '@/utils/auth'
-import { Message } from 'element-ui'
-import { evaluateAdd } from '../../../api/supplier/supplier'
-
-export default {
-  components: { inputVue, dialogHeader, RedStar },
-  props: {
-    dataInfo: {
-      type: Object,
-      dataInfo: {}
-    }
-  },
-  data() {
-    return {
-      isShowInfo: true,
-      fileName: '',
-      imageUrl: '',
-      imageUrl2: '',
-      fileName2: '',
-      myHeaders: { token: getToken() },
-      quarterOptions: [
-        { label: '2021第一季度', value: '2021第一季度' },
-        { label: '2021第二季度', value: '2021第二季度' }
-      ],
-      resultOptions: [
-        { label: 'A', value: 'A' },
-        { label: 'B', value: 'B' },
-        { label: 'C', value: 'C' }
-      ],
-      addInfo: {
-        supplierCode: '',
-        supplierName: '',
-        evaluateQuarterly: '',
-        quarterlyEvaluateResult: '',
-        quarterlyEvaluateIllustration: '',
-        quarterlyEvaluateDate: '',
-        quarterlyEvaluateFile: ''
-      }
-    }
-  },
-  watch: {
-    dataInfo: {
-      handler(val) {
-        console.log(val)
-        if (val != '') {
-          const temp = { ...this.addInfo }
-          this.addInfo = {
-            supplierCode: val.supplierCode,
-            supplierName: val.supplierName,
-            evaluateQuarterly: temp.evaluateQuarterly,
-            quarterlyEvaluateResult: temp.quarterlyEvaluateResult,
-            quarterlyEvaluateIllustration: temp.quarterlyEvaluateIllustration,
-            quarterlyEvaluateDate: temp.quarterlyEvaluateDate,
-            quarterlyEvaluateFile: temp.quarterlyEvaluateFile
-          }
-          console.log(this.addInfo)
-        }
-      },
-      deep: true,
-      immediate: true
-    }
-  },
-  methods: {
-    close() {
-      this.$emit('close')
-    },
-    // 照片上传
-    handleAvatarSuccess(res, file) {
-      this.fileName = res.data.fileName
-      console.log(res, file)
-      this.imageUrl = URL.createObjectURL(file.raw)
-      console.log(this.addInfo.quarterlyEvaluateFile, 'this.addInfo.quarterlyEvaluateFile')
-      if (this.addInfo.quarterlyEvaluateFile == '') {
-        console.log('1')
-        this.addInfo.quarterlyEvaluateFile = res.data.fileId
-      } else {
-        console.log('2')
-        this.addInfo.quarterlyEvaluateFile = this.addInfo.quarterlyEvaluateFile + ',' + res.data.fileId
-      }
-      console.log(this.addInfo.quarterlyEvaluateFile)
-    },
-    handleAvatarSuccess2(res, file) {
-      this.fileName2 = res.data.fileName
-      console.log(res, file)
-      this.imageUrl2 = URL.createObjectURL(file.raw)
-      if (this.addInfo.quarterlyEvaluateFile == '') {
-        console.log('3')
-        this.addInfo.quarterlyEvaluateFile = res.data.fileId
-      } else {
-        console.log('4')
-        this.addInfo.quarterlyEvaluateFile = this.addInfo.quarterlyEvaluateFile + ',' + res.data.fileId
-      }
-      console.log(this.addInfo.quarterlyEvaluateFile)
-    },
-    beforeAvatarUpload(file) {
-      const isJPG = file.type === 'image/jpeg'
-      const isLt2M = file.size / 1024 / 1024 < 2
-
-      if (!isJPG) {
-        this.$message.error('上传头像图片只能是 JPG 格式!')
-      }
-      if (!isLt2M) {
-        this.$message.error('上传头像图片大小不能超过 2MB!')
-      }
-      return isJPG && isLt2M
-    },
-    save() {
-      evaluateAdd(this.addInfo).then(res => {
-        console.log(res)
-        if (!res.code) {
-          this.close()
-          Message.success('保存成功')
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style lang='scss' scoped>
-.evaluateDialog {
-  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: 600px;
-      height: 250px;
-      display: flex;
-      justify-content: space-between;
-      padding: 10px 40px;
-      border: 1px solid #000;
-
-      .img-item {
-        width: 178px;
-        height: 200px;
-
-        .title-box {
-          display: flex;
-          justify-content: space-between;
-
-          .img-title {
-            width: 150px;
-            white-space: nowrap;
-            overflow: hidden;
-            text-overflow: ellipsis;
-            margin-right: 20px;
-          }
-
-          .img-btn {
-            .btn {
-              padding: 0;
-            }
-          }
-        }
-      }
-    }
-  }
-
-  .btnBox {
-    padding: 30px;
-    box-sizing: border-box;
-    display: flex;
-    align-items: center;
-    justify-content: space-evenly;
-
-    .save,
-    .close {
-      width: 100px;
-    }
-
-  }
-}
-
-.avatar-uploader .el-upload {
-  border: 1px dashed #d9d9d9;
-  border-radius: 6px;
-  cursor: pointer;
-  position: relative;
-  overflow: hidden;
-}
-
-.avatar-uploader .el-upload:hover {
-  border-color: #409EFF;
-}
-
-.avatar-uploader-icon {
-  font-size: 28px;
-  color: #8c939d;
-  width: 178px;
-  height: 178px;
-  line-height: 178px;
-  text-align: center;
-}
-
-.avatar {
-  width: 178px;
-  height: 178px;
-  display: block;
-}
-</style>
diff --git a/src/components/mycomponent/dialog/historyAssessDialog.vue b/src/components/mycomponent/dialog/historyAssessDialog.vue
deleted file mode 100644
index 30a0c57..0000000
--- a/src/components/mycomponent/dialog/historyAssessDialog.vue
+++ /dev/null
@@ -1,146 +0,0 @@
-<!--历史考核弹窗-->
-<template>
-  <div class="historyAssessDialog dialog">
-    <dialog-header title="历史考核" @close="close" />
-    <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="assessAnnualName" label="考核年度" width="150" />
-        <el-table-column prop="annualAssessResultName" label="年度考核结果" width="150" />
-        <el-table-column prop="annualAssessIllustration" label="年度考核说明" width="150" />
-        <el-table-column prop="annualAssessDate" label="年度考核时间" width="150" />
-        <el-table-column prop="annualAssessFile" 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>
-</template>
-
-<script>
-import dialogHeader from './dialogHeader.vue'
-import inputVue from '../input/inputVue.vue'
-import RedStar from '../redStar.vue'
-
-import { historyAssess } from '../../../api/supplier/supplier'
-
-export default {
-  components: { inputVue, dialogHeader, RedStar },
-  props: {
-    dataInfo: {
-      type: Object,
-      dataInfo: {}
-    }
-  },
-  data() {
-    return {
-      tableData: []
-    }
-  },
-  mounted() {
-    this.getHistoryAssess()
-  },
-  methods: {
-    // 生成序号
-    indexMethod(index) {
-      return index + 1
-    },
-    // 合并表头
-    headerStyle({ row, column, rowIndex, columnIndex }) {
-      row[5].colSpan = 2 // 第三列的表头占据2个单元格
-      row[6].colSpan = 0
-      if (columnIndex === 6) {
-        return 'display: none'
-      }
-    },
-    close() {
-      this.$emit('close')
-    },
-    getHistoryAssess() {
-      historyAssess().then(res => {
-        console.log(res)
-        this.tableData = res
-      })
-    }
-  }
-}
-</script>
-
-<style lang='scss' scoped>
-.historyAssessDialog {
-  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 {
-    margin: 20px;
-  }
-
-}
-</style>
diff --git a/src/components/mycomponent/dialog/historyEvaluateDialog.vue b/src/components/mycomponent/dialog/historyEvaluateDialog.vue
deleted file mode 100644
index 8fce92f..0000000
--- a/src/components/mycomponent/dialog/historyEvaluateDialog.vue
+++ /dev/null
@@ -1,148 +0,0 @@
-<!--历史评价弹窗-->
-<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>
-</template>
-
-<script>
-import dialogHeader from './dialogHeader.vue'
-import inputVue from '../input/inputVue.vue'
-import RedStar from '../redStar.vue'
-
-import { historyEvaluate } from '../../../api/supplier/supplier'
-
-export default {
-  components: { inputVue, dialogHeader, RedStar },
-  props: {
-    dataInfo: {
-      type: Object,
-      dataInfo: {}
-    }
-  },
-  data() {
-    return {
-      isShowInfo: true,
-      tableData: []
-    }
-  },
-  mounted() {
-    this.getHistoryEvaluate()
-  },
-  methods: {
-    // 生成序号
-    indexMethod(index) {
-      return index + 1
-    },
-    // 合并表头
-    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)
-        this.tableData = res
-      })
-    }
-  }
-}
-</script>
-
-<style lang='scss' scoped>
-.historyEvaluateDialog {
-  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 {
-        display: flex;
-        justify-content: inherit;
-        align-items: center;
-      }
-    }
-
-  }
-
-  .Dialog-table {
-    margin: 20px;
-  }
-
-}
-</style>
diff --git a/src/views/supplier/assess.vue b/src/views/supplier/assess.vue
index 5315ce9..aa1b324 100644
--- a/src/views/supplier/assess.vue
+++ b/src/views/supplier/assess.vue
@@ -86,8 +86,8 @@
 
 <script>
 import GroupPage from '../../components/mycomponent/groupPage.vue'
-import assessDialog from '../../components/mycomponent/dialog/assessDialog.vue'
-import historyAssessDialog from '../../components/mycomponent/dialog/historyAssessDialog.vue'
+import assessDialog from './assessDialog.vue'
+import historyAssessDialog from './historyAssessDialog.vue'
 
 import { a_list } from '../../api/supplier/supplier'
 import { tableRowClassName } from '../../utils/myUtils/changeTableTr'
diff --git a/src/views/supplier/assessDialog.vue b/src/views/supplier/assessDialog.vue
new file mode 100644
index 0000000..fd4bc00
--- /dev/null
+++ b/src/views/supplier/assessDialog.vue
@@ -0,0 +1,368 @@
+<!--年度考核弹窗-->
+<template>
+  <el-dialog title="年度考核" width="975px" :visible.sync="isShowInfo" append-to-body @close="close">
+    <div class="assessDialog">
+      <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.assessAnnual" clearable placeholder="请选择" style="width:200px">
+                <el-option v-for="item in yearOptions" :key="item.value" :label="item.label" :value="item.value" />
+              </el-select>
+            </input-vue>
+          </div>
+          <div class="inputBox">
+            <input-vue
+              v-model="addInfo.annualAssessIllustration"
+              title="年度考核说明"
+              class="inputWidth"
+              placeholder="请输入年度考核说明"
+              width="200px"
+            />
+          </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">
+            <red-star />
+            <input-vue title="考核结果" class="inputWidth">
+              <el-select v-model="addInfo.annualAssessResult" clearable placeholder="请选择" style="width:200px">
+                <el-option v-for="item in resultOptions" :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.annualAssessDate"
+                placeholder="请选择日期"
+                suffix-icon="el-icon-date"
+                style="width:200px"
+              />
+            </input-vue>
+          </div>
+        </div>
+      </div>
+      <div class="imgContent">
+        <div class="img-box">
+          <div class="img-item">
+            <div v-if="fileName" class="title-box">
+              <div class="img-title">
+                {{ fileName }}
+              </div>
+              <div class="img-btn">
+                <el-button type="text" class="btn">
+                  下载
+                </el-button>
+              </div>
+            </div>
+            <el-upload
+              class="avatar-uploader"
+              :headers="myHeaders"
+              action="http://111.198.10.15:21403/file/uploadFile"
+              :show-file-list="false"
+              :on-success="handleAvatarSuccess"
+              :before-upload="beforeAvatarUpload"
+            >
+              <img v-if="imageUrl" :src="imageUrl" class="avatar">
+              <i v-else class="el-icon-plus avatar-uploader-icon" />
+            </el-upload>
+          </div>
+          <div class="img-item">
+            <div v-if="fileName2" class="title-box">
+              <div class="img-title">
+                {{ fileName2 }}
+              </div>
+              <div class="img-btn">
+                <el-button type="text" class="btn">
+                  下载
+                </el-button>
+              </div>
+            </div>
+            <el-upload
+              class="avatar-uploader"
+              :headers="myHeaders"
+              action="http://111.198.10.15:21403/file/uploadFile"
+              :show-file-list="false"
+              :on-success="handleAvatarSuccess2"
+              :before-upload="beforeAvatarUpload"
+            >
+              <img v-if="imageUrl2" :src="imageUrl2" class="avatar">
+              <i v-else class="el-icon-plus avatar-uploader-icon" />
+            </el-upload>
+          </div>
+        </div>
+        <div class="uploadbtn">
+          <el-button type="primary">
+            上传录库评审结果
+          </el-button>
+        </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 '../../components/mycomponent/dialog/dialogHeader.vue'
+import inputVue from '../../components/mycomponent/input/inputVue.vue'
+import RedStar from '../../components/mycomponent/redStar.vue'
+
+import { getToken } from '@/utils/auth'
+import { Message } from 'element-ui'
+import { assessAdd } from '../../api/supplier/supplier'
+export default {
+  name: 'AssessDialog',
+  components: { inputVue, dialogHeader, RedStar },
+  props: {
+    assessAnnualOpts: {
+      type: Array,
+      default() {
+        return []
+      },
+      required: true
+    }
+  },
+  data() {
+    return {
+      fileName: '',
+      imageUrl: '',
+      imageUrl2: '',
+      fileName2: '',
+      myHeaders: { token: getToken() },
+      isShowInfo: true,
+      yearOptions: [
+        { label: '2021', value: '2021' },
+        { label: '2022', value: '2022' }
+      ],
+      resultOptions: [
+        { label: 'A', value: 'A' },
+        { label: 'B', value: 'B' },
+        { label: 'C', value: 'C' }
+      ],
+      addInfo: {
+        supplierCode: '',
+        supplierName: '',
+        assessAnnual: '',
+        annualAssessResult: '',
+        annualAssessIllustration: '',
+        annualAssessDate: '',
+        annualAssessFile: ''
+      }
+    }
+  },
+  watch: {
+    dataInfo: {
+      handler(val) {
+        console.log(val)
+        if (val != '') {
+          const temp = { ...this.addInfo }
+          this.addInfo = {
+            supplierCode: val.supplierCode,
+            supplierName: val.supplierName,
+            assessAnnual: temp.assessAnnual,
+            annualAssessResult: temp.annualAssessResult,
+            annualAssessIllustration: temp.annualAssessIllustration,
+            annualAssessDate: temp.annualAssessDate,
+            annualAssessFile: temp.annualAssessFile
+          }
+          console.log(this.addInfo)
+        }
+      },
+      deep: true,
+      immediate: true
+    }
+  },
+  methods: {
+    close() {
+      this.$emit('close')
+    },
+    // 照片上传
+    handleAvatarSuccess(res, file) {
+      this.fileName = res.data.fileName
+      console.log(res, file)
+      this.imageUrl = URL.createObjectURL(file.raw)
+      console.log(this.addInfo.annualAssessFile, 'this.addInfo.annualAssessFile')
+      if (this.addInfo.annualAssessFile == '') {
+        console.log('1')
+        this.addInfo.annualAssessFile = res.data.fileId
+      } else {
+        console.log('2')
+        this.addInfo.annualAssessFile = this.addInfo.annualAssessFile + ',' + res.data.fileId
+      }
+      console.log(this.addInfo.annualAssessFile)
+    },
+    handleAvatarSuccess2(res, file) {
+      this.fileName2 = res.data.fileName
+      console.log(res, file)
+      this.imageUrl2 = URL.createObjectURL(file.raw)
+      if (this.addInfo.annualAssessFile == '') {
+        console.log('3')
+        this.addInfo.annualAssessFile = res.data.fileId
+      } else {
+        console.log('4')
+        this.addInfo.annualAssessFile = this.addInfo.annualAssessFile + ',' + res.data.fileId
+      }
+      console.log(this.addInfo.annualAssessFile)
+    },
+    beforeAvatarUpload(file) {
+      const isJPG = file.type === 'image/jpeg'
+      const isLt2M = file.size / 1024 / 1024 < 2
+
+      if (!isJPG) {
+        this.$message.error('上传头像图片只能是 JPG 格式!')
+      }
+      if (!isLt2M) {
+        this.$message.error('上传头像图片大小不能超过 2MB!')
+      }
+      return isJPG && isLt2M
+    },
+    save() {
+      assessAdd(this.addInfo).then(res => {
+        console.log(res)
+        if (!res.code) {
+          this.close()
+          Message.success('保存成功')
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style lang='scss' scoped>
+.assessDialog {
+  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: 600px;
+      height: 250px;
+      display: flex;
+      justify-content: space-between;
+      padding: 10px 40px;
+      border: 1px solid #000;
+
+      .img-item {
+        width: 178px;
+        height: 200px;
+
+        .title-box {
+          display: flex;
+          justify-content: space-between;
+
+          .img-title {
+            width: 150px;
+            white-space: nowrap;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            margin-right: 20px;
+          }
+
+          .img-btn {
+            .btn {
+              padding: 0;
+            }
+          }
+        }
+      }
+    }
+  }
+
+  .btnBox {
+    padding: 30px;
+    box-sizing: border-box;
+    display: flex;
+    align-items: center;
+    justify-content: space-evenly;
+
+    .save,
+    .close {
+      width: 100px;
+    }
+
+  }
+}
+
+.avatar-uploader .el-upload {
+  border: 1px dashed #d9d9d9;
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+}
+
+.avatar-uploader .el-upload:hover {
+  border-color: #409EFF;
+}
+
+.avatar-uploader-icon {
+  font-size: 28px;
+  color: #8c939d;
+  width: 178px;
+  height: 178px;
+  line-height: 178px;
+  text-align: center;
+}
+
+.avatar {
+  width: 178px;
+  height: 178px;
+  display: block;
+}
+</style>
diff --git a/src/views/supplier/evaluate.vue b/src/views/supplier/evaluate.vue
index f3ee896..7653a58 100644
--- a/src/views/supplier/evaluate.vue
+++ b/src/views/supplier/evaluate.vue
@@ -3,33 +3,26 @@
   <div class="evaluate">
     <div class="evaluate-inputs">
       供应商编号
-      <el-input
-        v-model="selectInfo.supplierCode"
-        style="width: 200px"
-        placeholder="请输入编号"
-        clearable
-        class="evaluate-input"
-      />
+      <el-input v-model="selectInfo.supplierCode" style="width: 200px" placeholder="请输入编号" clearable class="evaluate-input"/>
 
       供应商名称
-      <el-input
-        v-model="selectInfo.supplierName"
-        style="width: 200px"
-        placeholder="请输入供应商名称"
-        clearable
-        class="evaluate-input"
-      />
+      <el-input v-model="selectInfo.supplierName" style="width: 200px" placeholder="请输入供应商名称" clearable class="evaluate-input"/>
 
-      评价时间
-      <el-select
-        v-model="selectInfo.evaluateQuarterly"
-        class="evaluate-select"
-        filterable
-        placeholder="请选择结果"
-        style="width: 200px"
-      >
-        <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
+      年份
+      <el-select v-model="selectInfo.evaluateYear" class="evaluate-select" clearable placeholder="请选择年份" style="width: 150px">
+        <el-option v-for="item in evaluateAnnualOpts" :key="item.id" :label="item.name" :value="item.value" />
       </el-select>
+
+      季度
+      <el-select v-model="selectInfo.evaluateQuarterly" class="evaluate-select" clearable placeholder="请选择季度" style="width: 150px">
+        <el-option v-for="item in evaluateQuarterlyOpts" :key="item.id" :label="item.name" :value="item.value" />
+      </el-select>
+
+      评价结果
+      <el-select v-model="selectInfo.quarterlyEvaluateResult" class="evaluate-select" clearable placeholder="请选择评价结果" style="width: 150px">
+        <el-option v-for="item in evaluateResultOpts" :key="item.id" :label="item.name" :value="item.value" />
+      </el-select>
+
       <div class="evaluate-btns">
         <el-button type="primary" class="evaluate-button" @click="selectData">
           查询
@@ -51,14 +44,18 @@
         :row-style="{ 'text-align': 'center' }"
         style="width: 100%"
       >
-        <el-table-column type="index" label="序号" width="180" />
-        <el-table-column prop="supplierCode" label="供应商编号" width="180" />
-        <el-table-column prop="supplierName" label="供应商名称" />
-        <el-table-column prop="supplierStatusName" label="供应商状态" />
-        <el-table-column prop="evaluateQuarterlyName" label="最新季度评价" />
-        <el-table-column prop="quarterlyEvaluateResult" label="季度评价结果" />
-        <el-table-column prop="quarterlyEvaluateDate" label="季度评价日期" />
-        <el-table-column header-align="center" align="center" fixed="right" label="操作">
+        <el-table-column type="index" label="序号" width="100" />
+        <el-table-column prop="supplierCode" label="供应商编号" width="200" />
+        <el-table-column prop="supplierName" label="供应商名称" width="400" />
+        <el-table-column prop="supplierStatusName" label="供应商状态" width="100" />
+        <el-table-column label="最新评价季度">
+          <template v-if="scope.row.evaluateYearName !== ''" slot-scope="scope">
+            {{ scope.row.evaluateYearName }}年{{ scope.row.evaluateQuarterlyName }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="quarterlyEvaluateResultName" label="季度评价结果" width="150" />
+        <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)">
               历史评价
@@ -80,21 +77,29 @@
       />
     </div>
     <historyEvaluateDialog v-if="isShowHistoryDialog" :data-info="dataInfo" @close="evaluateHistoryDialogClose" />
-    <evaluateDialog v-if="isShowDialog" :data-info="dataInfo" @close="evaluateDialogClose" />
+    <evaluate-dialog
+      ref="evaluateDialog"
+                     @refreshList="selectData"
+                     :evaluate-annual-opts="evaluateAnnualOpts"
+                     :evaluate-quarterly-opts="evaluateQuarterlyOpts"
+                     :evaluate-result-opts="evaluateResultOpts"
+    />
   </div>
 </template>
 
 <script>
 import GroupPage from '../../components/mycomponent/groupPage.vue'
-import evaluateDialog from '../../components/mycomponent/dialog/evaluateDialog.vue'
-import historyEvaluateDialog from '../../components/mycomponent/dialog/historyEvaluateDialog.vue'
+import EvaluateDialog from '@/views/supplier/evaluateDialog'
+import historyEvaluateDialog from './historyEvaluateDialog.vue'
 
 import { e_list } from '../../api/supplier/supplier'
 import { tableRowClassName } from '../../utils/myUtils/changeTableTr'
 import { listMixin } from '../../utils/myUtils/mixins/listPage'
+import { getDictByCode } from '@/api/system/dict'
+
 export default { // 加入分页逻辑
   components: {
-    historyEvaluateDialog, evaluateDialog, GroupPage
+    historyEvaluateDialog, EvaluateDialog, GroupPage
   },
   mixins: [listMixin],
   data() {
@@ -105,18 +110,43 @@
       selectInfo: {
         supplierCode: '',
         supplierName: '',
-        evaluateQuarterly: ''
+        evaluateYear: '',
+        evaluateQuarterly: '',
+        quarterlyEvaluateResult: ''
       },
-      options: [
-        { label: '2022第一季度', value: '2022第一季度' },
-        { label: '2021第二季度', value: '2021第二季度' }
-      ]
+      evaluateAnnualOpts: [],
+      evaluateQuarterlyOpts: [],
+      evaluateResultOpts: []
     }
   },
   mounted() {
+    this.getDictEvaluateAnnual()
+    this.getDictEvaluateQuarterly()
+    this.getDictEvaluateResult()
   },
   methods: {
     tableRowClassName: tableRowClassName,
+    getDictEvaluateAnnual() {
+      getDictByCode('assessAnnual').then(response => {
+        if (response.code === 200) {
+          this.evaluateAnnualOpts = response.data
+        }
+      })
+    },
+    getDictEvaluateQuarterly() {
+      getDictByCode('evaluateQuarterly').then(response => {
+        if (response.code === 200) {
+          this.evaluateQuarterlyOpts = response.data
+        }
+      })
+    },
+    getDictEvaluateResult() {
+      getDictByCode('evaluateResult').then(response => {
+        if (response.code === 200) {
+          this.evaluateResultOpts = response.data
+        }
+      })
+    },
     hitstoryDialog(row) {
       this.dataInfo = row
       this.isShowHistoryDialog = true
@@ -128,10 +158,9 @@
       this.isShowDialog = false
     },
     evaluateDialogClick(row) {
-      this.dataInfo = row
-      this.isShowDialog = true
+      this.$refs.evaluateDialog.initDialog(row)
     },
-    getListPage(limit, offset) {
+    getListPage(limit = 10, offset = 1) {
       e_list(`limit=${limit}&offset=${offset}`, this.queryInfo).then(res => {
         console.log(res)
         this.tableData = res
@@ -141,7 +170,9 @@
       this.selectInfo = { // 搜索框中的数据的数据
         supplierCode: '',
         supplierName: '',
-        evaluateQuarterly: ''
+        evaluateYear: '',
+        evaluateQuarterly: '',
+        quarterlyEvaluateResult: ''
       }
     }
   }
@@ -166,7 +197,7 @@
   }
 
   .evaluate-select {
-    margin: 0 4rem 0 0.5rem;
+    margin: 0 1rem 0 0.5rem;
   }
 
   .evaluate-btns {
diff --git a/src/views/supplier/evaluateDialog.vue b/src/views/supplier/evaluateDialog.vue
new file mode 100644
index 0000000..b217191
--- /dev/null
+++ b/src/views/supplier/evaluateDialog.vue
@@ -0,0 +1,309 @@
+<!--季度评价弹窗-->
+<template>
+  <el-dialog title="季度评价" width="975px" :visible.sync="isShowInfo" append-to-body @close="close">
+    <el-form ref="evaluateForm" :model="addInfo" :rules="evaluateRules" 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="evaluateYear">
+            <el-select v-model="addInfo.evaluateYear" clearable placeholder="请选择年份" style="width: 100%">
+              <el-option v-for="item in evaluateAnnualOpts" :key="item.id" :label="item.name" :value="item.value" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="10">
+          <el-form-item label="季度" prop="evaluateQuarterly">
+            <el-select v-model="addInfo.evaluateQuarterly" clearable placeholder="请选择季度" style="width: 100%">
+              <el-option v-for="item in evaluateQuarterlyOpts" :key="item.id" :label="item.name" :value="item.value" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="10">
+          <el-form-item label="评审结果" prop="quarterlyEvaluateResult">
+            <el-select v-model="addInfo.quarterlyEvaluateResult" clearable placeholder="请选择评价结果" style="width: 100%">
+              <el-option v-for="item in evaluateResultOpts" :key="item.id" :label="item.name" :value="item.value" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="10">
+          <el-form-item label="评审日期" prop="quarterlyEvaluateDate">
+            <el-date-picker v-model="addInfo.quarterlyEvaluateDate" 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="评审结果说明">
+            <el-input v-model="addInfo.quarterlyEvaluateIllustration" 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="evaluateFile"
+              action="action"
+              :file-list="quarterlyEvaluateFileList"
+              :http-request="uploadQuarterlyEvaluateFile"
+              :before-upload="handleBeforeUpload"
+              :on-remove="handleQuarterlyEvaluateFileRemove"
+              :on-exceed="quarterlyEvaluateFileExceed"
+              :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="evaluateDialog">
+      <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 { evaluateAdd } from '@/api/supplier/supplier'
+import { Uploadimg } from '@/api/common'
+import { getToday } from '@/utils/dateutils'
+
+export default {
+  name: 'EvaluateDialog',
+  props: {
+    evaluateAnnualOpts: {
+      type: Array,
+      default() {
+        return []
+      },
+      required: true
+    },
+    evaluateQuarterlyOpts: {
+      type: Array,
+      default() {
+        return []
+      },
+      required: true
+    },
+    evaluateResultOpts: {
+      type: Array,
+      default() {
+        return []
+      },
+      required: true
+    }
+  },
+  data() {
+    return {
+      isShowInfo: false,
+      quarterOptions: [
+        { label: '2021第一季度', value: '2021第一季度' },
+        { label: '2021第二季度', value: '2021第二季度' }
+      ],
+      resultOptions: [
+        { label: 'A', value: 'A' },
+        { label: 'B', value: 'B' },
+        { label: 'C', value: 'C' }
+      ],
+      addInfo: {
+        supplierCode: '',
+        supplierName: '',
+        evaluateYear: '',
+        evaluateQuarterly: '',
+        quarterlyEvaluateResult: '',
+        quarterlyEvaluateIllustration: '',
+        quarterlyEvaluateDate: '',
+        quarterlyEvaluateFile: ''
+      },
+      evaluateRules: {
+        evaluateYear: [{ required: true, message: '请选择评价年份', trigger: 'change' }],
+        evaluateQuarterly: [{ required: true, message: '请选择评价季度', trigger: 'change' }],
+        quarterlyEvaluateResult: [{ required: true, message: '请选择评价结果', trigger: 'change' }],
+        quarterlyEvaluateDate: [{ required: true, message: '请选择评价日期', trigger: 'blur' }]
+      },
+      quarterlyEvaluateFileList: [],
+      evaluateValid: 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.quarterlyEvaluateDate = getToday('yyyy-MM-dd')
+      }
+    },
+    save() {
+      this.validateForm()
+      if (this.evaluateValid === true) {
+        if (this.quarterlyEvaluateFileList.length > 0) {
+          for (const i in this.quarterlyEvaluateFileList) {
+            this.addInfo.quarterlyEvaluateFile += this.quarterlyEvaluateFileList[i].url + ','
+          }
+
+          this.addInfo.quarterlyEvaluateFile = this.addInfo.quarterlyEvaluateFile.substring(0, this.addInfo.quarterlyEvaluateFile.length - 1)
+        }
+
+        evaluateAdd(this.addInfo).then(res => {
+          if (!res.code) {
+            this.$message.success('保存成功')
+            this.clearForm()
+            this.close()
+          }
+        })
+      }
+    },
+    validateForm: function() {
+      this.$refs.evaluateForm.validate(valid => {
+        this.evaluateValid = valid
+      })
+    },
+    clearForm() {
+      this.addInfo = {
+        supplierCode: '',
+        supplierName: '',
+        evaluateYear: '',
+        evaluateQuarterly: '',
+        quarterlyEvaluateResult: '',
+        quarterlyEvaluateIllustration: '',
+        quarterlyEvaluateDate: '',
+        quarterlyEvaluateFile: ''
+      }
+      this.quarterlyEvaluateFileList = []
+      // 清除验证
+      this.$nextTick(() => {
+        this.$refs.evaluateForm.clearValidate()
+      })
+    },
+    uploadQuarterlyEvaluateFile(file) {
+      // 判断文件是否已经上传过
+      for (const i in this.quarterlyEvaluateFileList) {
+        if (this.quarterlyEvaluateFileList[i].name === file.name) {
+          this.$message.error('该文件已上传过，请选择其他文件')
+          this.handleFileNotUploaded(file, this.$refs.evaluateFile.uploadFiles)
+          return
+        }
+      }
+
+      Uploadimg(file).then(res => {
+        if (res.code === 200) {
+          this.quarterlyEvaluateFileList.push({
+            name: res.data.fileName,
+            url: res.data.fileId,
+            type: file.file.type
+          })
+          this.$message.success('文件上传成功')
+        }
+      })
+    },
+    handleQuarterlyEvaluateFileRemove(file) {
+      this.handleRemove(file, this.quarterlyEvaluateFileList)
+    },
+    quarterlyEvaluateFileExceed(file, fileList) {
+      this.handleExceed(file, this.quarterlyEvaluateFileList)
+    },
+    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>
+.evaluateDialog {
+  width: 975px;
+  padding: 0 20px;
+  box-sizing: border-box;
+
+  .btnBox {
+    padding: 30px;
+    box-sizing: border-box;
+    display: flex;
+    align-items: center;
+    justify-content: space-evenly;
+
+    .save,
+    .close {
+      width: 200px;
+    }
+
+  }
+}
+</style>
diff --git a/src/views/supplier/historyAssessDialog.vue b/src/views/supplier/historyAssessDialog.vue
new file mode 100644
index 0000000..83694dd
--- /dev/null
+++ b/src/views/supplier/historyAssessDialog.vue
@@ -0,0 +1,146 @@
+<!--历史考核弹窗-->
+<template>
+  <div class="historyAssessDialog dialog">
+    <dialog-header title="历史考核" @close="close" />
+    <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="assessAnnualName" label="考核年度" width="150" />
+        <el-table-column prop="annualAssessResultName" label="年度考核结果" width="150" />
+        <el-table-column prop="annualAssessIllustration" label="年度考核说明" width="150" />
+        <el-table-column prop="annualAssessDate" label="年度考核时间" width="150" />
+        <el-table-column prop="annualAssessFile" 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>
+</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 { historyAssess } from '../../api/supplier/supplier'
+
+export default {
+  components: { inputVue, dialogHeader, RedStar },
+  props: {
+    dataInfo: {
+      type: Object,
+      dataInfo: {}
+    }
+  },
+  data() {
+    return {
+      tableData: []
+    }
+  },
+  mounted() {
+    this.getHistoryAssess()
+  },
+  methods: {
+    // 生成序号
+    indexMethod(index) {
+      return index + 1
+    },
+    // 合并表头
+    headerStyle({ row, column, rowIndex, columnIndex }) {
+      row[5].colSpan = 2 // 第三列的表头占据2个单元格
+      row[6].colSpan = 0
+      if (columnIndex === 6) {
+        return 'display: none'
+      }
+    },
+    close() {
+      this.$emit('close')
+    },
+    getHistoryAssess() {
+      historyAssess().then(res => {
+        console.log(res)
+        this.tableData = res
+      })
+    }
+  }
+}
+</script>
+
+<style lang='scss' scoped>
+.historyAssessDialog {
+  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 {
+    margin: 20px;
+  }
+
+}
+</style>
diff --git a/src/views/supplier/historyEvaluateDialog.vue b/src/views/supplier/historyEvaluateDialog.vue
new file mode 100644
index 0000000..092fc37
--- /dev/null
+++ b/src/views/supplier/historyEvaluateDialog.vue
@@ -0,0 +1,148 @@
+<!--历史评价弹窗-->
+<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>
+</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'
+
+export default {
+  components: { inputVue, dialogHeader, RedStar },
+  props: {
+    dataInfo: {
+      type: Object,
+      dataInfo: {}
+    }
+  },
+  data() {
+    return {
+      isShowInfo: true,
+      tableData: []
+    }
+  },
+  mounted() {
+    this.getHistoryEvaluate()
+  },
+  methods: {
+    // 生成序号
+    indexMethod(index) {
+      return index + 1
+    },
+    // 合并表头
+    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)
+        this.tableData = res
+      })
+    }
+  }
+}
+</script>
+
+<style lang='scss' scoped>
+.historyEvaluateDialog {
+  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 {
+        display: flex;
+        justify-content: inherit;
+        align-items: center;
+      }
+    }
+
+  }
+
+  .Dialog-table {
+    margin: 20px;
+  }
+
+}
+</style>

diff --git a/src/api/supplier/supplier.js b/src/api/supplier/supplier.js
index 0fd037c..fe31ad0 100644
--- a/src/api/supplier/supplier.js
+++ b/src/api/supplier/supplier.js
@@ -48,7 +48,7 @@
 
 // 新增
 const evaluateAdd = (data) => {
-  return instance.post('/supplierInputReview/add', data)
+  return instance.post('/supplierQuarterlyEvaluate/add', data)
 }
 
 // 年度考核不分页列表
diff --git a/src/components/mycomponent/dialog/assessDialog.vue b/src/components/mycomponent/dialog/assessDialog.vue
deleted file mode 100644
index 5bb387d..0000000
--- a/src/components/mycomponent/dialog/assessDialog.vue
+++ /dev/null
@@ -1,364 +0,0 @@
-<!--年度考核弹窗-->
-<template>
-  <el-dialog title="年度考核" width="975px" :visible.sync="isShowInfo" append-to-body @close="close">
-    <div class="assessDialog">
-      <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.assessAnnual" clearable placeholder="请选择" style="width:200px">
-                <el-option v-for="item in yearOptions" :key="item.value" :label="item.label" :value="item.value" />
-              </el-select>
-            </input-vue>
-          </div>
-          <div class="inputBox">
-            <input-vue
-              v-model="addInfo.annualAssessIllustration"
-              title="年度考核说明"
-              class="inputWidth"
-              placeholder="请输入年度考核说明"
-              width="200px"
-            />
-          </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">
-            <red-star />
-            <input-vue title="考核结果" class="inputWidth">
-              <el-select v-model="addInfo.annualAssessResult" clearable placeholder="请选择" style="width:200px">
-                <el-option v-for="item in resultOptions" :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.annualAssessDate"
-                placeholder="请选择日期"
-                suffix-icon="el-icon-date"
-                style="width:200px"
-              />
-            </input-vue>
-          </div>
-        </div>
-      </div>
-      <div class="imgContent">
-        <div class="img-box">
-          <div class="img-item">
-            <div v-if="fileName" class="title-box">
-              <div class="img-title">
-                {{ fileName }}
-              </div>
-              <div class="img-btn">
-                <el-button type="text" class="btn">
-                  下载
-                </el-button>
-              </div>
-            </div>
-            <el-upload
-              class="avatar-uploader"
-              :headers="myHeaders"
-              action="http://111.198.10.15:21403/file/uploadFile"
-              :show-file-list="false"
-              :on-success="handleAvatarSuccess"
-              :before-upload="beforeAvatarUpload"
-            >
-              <img v-if="imageUrl" :src="imageUrl" class="avatar">
-              <i v-else class="el-icon-plus avatar-uploader-icon" />
-            </el-upload>
-          </div>
-          <div class="img-item">
-            <div v-if="fileName2" class="title-box">
-              <div class="img-title">
-                {{ fileName2 }}
-              </div>
-              <div class="img-btn">
-                <el-button type="text" class="btn">
-                  下载
-                </el-button>
-              </div>
-            </div>
-            <el-upload
-              class="avatar-uploader"
-              :headers="myHeaders"
-              action="http://111.198.10.15:21403/file/uploadFile"
-              :show-file-list="false"
-              :on-success="handleAvatarSuccess2"
-              :before-upload="beforeAvatarUpload"
-            >
-              <img v-if="imageUrl2" :src="imageUrl2" class="avatar">
-              <i v-else class="el-icon-plus avatar-uploader-icon" />
-            </el-upload>
-          </div>
-        </div>
-        <div class="uploadbtn">
-          <el-button type="primary">
-            上传录库评审结果
-          </el-button>
-        </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 { getToken } from '@/utils/auth'
-import { Message } from 'element-ui'
-import { assessAdd } from '../../../api/supplier/supplier'
-export default {
-  components: { inputVue, dialogHeader, RedStar },
-  props: {
-    dataInfo: {
-      type: Object,
-      dataInfo: {}
-    }
-  },
-  data() {
-    return {
-      fileName: '',
-      imageUrl: '',
-      imageUrl2: '',
-      fileName2: '',
-      myHeaders: { token: getToken() },
-      isShowInfo: true,
-      yearOptions: [
-        { label: '2021', value: '2021' },
-        { label: '2022', value: '2022' }
-      ],
-      resultOptions: [
-        { label: 'A', value: 'A' },
-        { label: 'B', value: 'B' },
-        { label: 'C', value: 'C' }
-      ],
-      addInfo: {
-        supplierCode: '',
-        supplierName: '',
-        assessAnnual: '',
-        annualAssessResult: '',
-        annualAssessIllustration: '',
-        annualAssessDate: '',
-        annualAssessFile: ''
-      }
-    }
-  },
-  watch: {
-    dataInfo: {
-      handler(val) {
-        console.log(val)
-        if (val != '') {
-          const temp = { ...this.addInfo }
-          this.addInfo = {
-            supplierCode: val.supplierCode,
-            supplierName: val.supplierName,
-            assessAnnual: temp.assessAnnual,
-            annualAssessResult: temp.annualAssessResult,
-            annualAssessIllustration: temp.annualAssessIllustration,
-            annualAssessDate: temp.annualAssessDate,
-            annualAssessFile: temp.annualAssessFile
-          }
-          console.log(this.addInfo)
-        }
-      },
-      deep: true,
-      immediate: true
-    }
-  },
-  methods: {
-    close() {
-      this.$emit('close')
-    },
-    // 照片上传
-    handleAvatarSuccess(res, file) {
-      this.fileName = res.data.fileName
-      console.log(res, file)
-      this.imageUrl = URL.createObjectURL(file.raw)
-      console.log(this.addInfo.annualAssessFile, 'this.addInfo.annualAssessFile')
-      if (this.addInfo.annualAssessFile == '') {
-        console.log('1')
-        this.addInfo.annualAssessFile = res.data.fileId
-      } else {
-        console.log('2')
-        this.addInfo.annualAssessFile = this.addInfo.annualAssessFile + ',' + res.data.fileId
-      }
-      console.log(this.addInfo.annualAssessFile)
-    },
-    handleAvatarSuccess2(res, file) {
-      this.fileName2 = res.data.fileName
-      console.log(res, file)
-      this.imageUrl2 = URL.createObjectURL(file.raw)
-      if (this.addInfo.annualAssessFile == '') {
-        console.log('3')
-        this.addInfo.annualAssessFile = res.data.fileId
-      } else {
-        console.log('4')
-        this.addInfo.annualAssessFile = this.addInfo.annualAssessFile + ',' + res.data.fileId
-      }
-      console.log(this.addInfo.annualAssessFile)
-    },
-    beforeAvatarUpload(file) {
-      const isJPG = file.type === 'image/jpeg'
-      const isLt2M = file.size / 1024 / 1024 < 2
-
-      if (!isJPG) {
-        this.$message.error('上传头像图片只能是 JPG 格式!')
-      }
-      if (!isLt2M) {
-        this.$message.error('上传头像图片大小不能超过 2MB!')
-      }
-      return isJPG && isLt2M
-    },
-    save() {
-      assessAdd(this.addInfo).then(res => {
-        console.log(res)
-        if (!res.code) {
-          this.close()
-          Message.success('保存成功')
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style lang='scss' scoped>
-.assessDialog {
-  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: 600px;
-      height: 250px;
-      display: flex;
-      justify-content: space-between;
-      padding: 10px 40px;
-      border: 1px solid #000;
-
-      .img-item {
-        width: 178px;
-        height: 200px;
-
-        .title-box {
-          display: flex;
-          justify-content: space-between;
-
-          .img-title {
-            width: 150px;
-            white-space: nowrap;
-            overflow: hidden;
-            text-overflow: ellipsis;
-            margin-right: 20px;
-          }
-
-          .img-btn {
-            .btn {
-              padding: 0;
-            }
-          }
-        }
-      }
-    }
-  }
-
-  .btnBox {
-    padding: 30px;
-    box-sizing: border-box;
-    display: flex;
-    align-items: center;
-    justify-content: space-evenly;
-
-    .save,
-    .close {
-      width: 100px;
-    }
-
-  }
-}
-
-.avatar-uploader .el-upload {
-  border: 1px dashed #d9d9d9;
-  border-radius: 6px;
-  cursor: pointer;
-  position: relative;
-  overflow: hidden;
-}
-
-.avatar-uploader .el-upload:hover {
-  border-color: #409EFF;
-}
-
-.avatar-uploader-icon {
-  font-size: 28px;
-  color: #8c939d;
-  width: 178px;
-  height: 178px;
-  line-height: 178px;
-  text-align: center;
-}
-
-.avatar {
-  width: 178px;
-  height: 178px;
-  display: block;
-}
-</style>
diff --git a/src/components/mycomponent/dialog/evaluateDialog.vue b/src/components/mycomponent/dialog/evaluateDialog.vue
deleted file mode 100644
index ba3ad75..0000000
--- a/src/components/mycomponent/dialog/evaluateDialog.vue
+++ /dev/null
@@ -1,365 +0,0 @@
-<!--季度评价弹窗-->
-<template>
-  <el-dialog title="季度评价" width="975px" :visible.sync="isShowInfo" append-to-body @close="close">
-    <div class="evaluateDialog">
-      <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.evaluateQuarterly" clearable placeholder="请选择" style="width:200px">
-                <el-option v-for="item in quarterOptions" :key="item.value" :label="item.label" :value="item.value" />
-              </el-select>
-            </input-vue>
-          </div>
-          <div class="inputBox">
-            <input-vue
-              v-model="addInfo.quarterlyEvaluateIllustration"
-              title="季度评价说明"
-              class="inputWidth"
-              placeholder="请输入季度评价说明"
-              width="200px"
-            />
-          </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">
-            <red-star />
-            <input-vue title="季度评价结果" class="inputWidth">
-              <el-select v-model="addInfo.quarterlyEvaluateResult" clearable placeholder="请选择" style="width:200px">
-                <el-option v-for="item in resultOptions" :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.quarterlyEvaluateDate"
-                placeholder="请选择日期"
-                suffix-icon="el-icon-date"
-                style="width:200px"
-              />
-            </input-vue>
-          </div>
-        </div>
-      </div>
-      <div class="imgContent">
-        <div class="img-box">
-          <div class="img-item">
-            <div v-if="fileName" class="title-box">
-              <div class="img-title">
-                {{ fileName }}
-              </div>
-              <div class="img-btn">
-                <el-button type="text" class="btn">
-                  下载
-                </el-button>
-              </div>
-            </div>
-            <el-upload
-              class="avatar-uploader"
-              :headers="myHeaders"
-              action="http://111.198.10.15:21403/file/uploadFile"
-              :show-file-list="false"
-              :on-success="handleAvatarSuccess"
-              :before-upload="beforeAvatarUpload"
-            >
-              <img v-if="imageUrl" :src="imageUrl" class="avatar">
-              <i v-else class="el-icon-plus avatar-uploader-icon" />
-            </el-upload>
-          </div>
-          <div class="img-item">
-            <div v-if="fileName2" class="title-box">
-              <div class="img-title">
-                {{ fileName2 }}
-              </div>
-              <div class="img-btn">
-                <el-button type="text" class="btn">
-                  下载
-                </el-button>
-              </div>
-            </div>
-            <el-upload
-              class="avatar-uploader"
-              :headers="myHeaders"
-              action="http://111.198.10.15:21403/file/uploadFile"
-              :show-file-list="false"
-              :on-success="handleAvatarSuccess2"
-              :before-upload="beforeAvatarUpload"
-            >
-              <img v-if="imageUrl2" :src="imageUrl2" class="avatar">
-              <i v-else class="el-icon-plus avatar-uploader-icon" />
-            </el-upload>
-          </div>
-        </div>
-        <div class="uploadbtn">
-          <el-button type="primary">
-            上传录库评审结果
-          </el-button>
-        </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 { getToken } from '@/utils/auth'
-import { Message } from 'element-ui'
-import { evaluateAdd } from '../../../api/supplier/supplier'
-
-export default {
-  components: { inputVue, dialogHeader, RedStar },
-  props: {
-    dataInfo: {
-      type: Object,
-      dataInfo: {}
-    }
-  },
-  data() {
-    return {
-      isShowInfo: true,
-      fileName: '',
-      imageUrl: '',
-      imageUrl2: '',
-      fileName2: '',
-      myHeaders: { token: getToken() },
-      quarterOptions: [
-        { label: '2021第一季度', value: '2021第一季度' },
-        { label: '2021第二季度', value: '2021第二季度' }
-      ],
-      resultOptions: [
-        { label: 'A', value: 'A' },
-        { label: 'B', value: 'B' },
-        { label: 'C', value: 'C' }
-      ],
-      addInfo: {
-        supplierCode: '',
-        supplierName: '',
-        evaluateQuarterly: '',
-        quarterlyEvaluateResult: '',
-        quarterlyEvaluateIllustration: '',
-        quarterlyEvaluateDate: '',
-        quarterlyEvaluateFile: ''
-      }
-    }
-  },
-  watch: {
-    dataInfo: {
-      handler(val) {
-        console.log(val)
-        if (val != '') {
-          const temp = { ...this.addInfo }
-          this.addInfo = {
-            supplierCode: val.supplierCode,
-            supplierName: val.supplierName,
-            evaluateQuarterly: temp.evaluateQuarterly,
-            quarterlyEvaluateResult: temp.quarterlyEvaluateResult,
-            quarterlyEvaluateIllustration: temp.quarterlyEvaluateIllustration,
-            quarterlyEvaluateDate: temp.quarterlyEvaluateDate,
-            quarterlyEvaluateFile: temp.quarterlyEvaluateFile
-          }
-          console.log(this.addInfo)
-        }
-      },
-      deep: true,
-      immediate: true
-    }
-  },
-  methods: {
-    close() {
-      this.$emit('close')
-    },
-    // 照片上传
-    handleAvatarSuccess(res, file) {
-      this.fileName = res.data.fileName
-      console.log(res, file)
-      this.imageUrl = URL.createObjectURL(file.raw)
-      console.log(this.addInfo.quarterlyEvaluateFile, 'this.addInfo.quarterlyEvaluateFile')
-      if (this.addInfo.quarterlyEvaluateFile == '') {
-        console.log('1')
-        this.addInfo.quarterlyEvaluateFile = res.data.fileId
-      } else {
-        console.log('2')
-        this.addInfo.quarterlyEvaluateFile = this.addInfo.quarterlyEvaluateFile + ',' + res.data.fileId
-      }
-      console.log(this.addInfo.quarterlyEvaluateFile)
-    },
-    handleAvatarSuccess2(res, file) {
-      this.fileName2 = res.data.fileName
-      console.log(res, file)
-      this.imageUrl2 = URL.createObjectURL(file.raw)
-      if (this.addInfo.quarterlyEvaluateFile == '') {
-        console.log('3')
-        this.addInfo.quarterlyEvaluateFile = res.data.fileId
-      } else {
-        console.log('4')
-        this.addInfo.quarterlyEvaluateFile = this.addInfo.quarterlyEvaluateFile + ',' + res.data.fileId
-      }
-      console.log(this.addInfo.quarterlyEvaluateFile)
-    },
-    beforeAvatarUpload(file) {
-      const isJPG = file.type === 'image/jpeg'
-      const isLt2M = file.size / 1024 / 1024 < 2
-
-      if (!isJPG) {
-        this.$message.error('上传头像图片只能是 JPG 格式!')
-      }
-      if (!isLt2M) {
-        this.$message.error('上传头像图片大小不能超过 2MB!')
-      }
-      return isJPG && isLt2M
-    },
-    save() {
-      evaluateAdd(this.addInfo).then(res => {
-        console.log(res)
-        if (!res.code) {
-          this.close()
-          Message.success('保存成功')
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style lang='scss' scoped>
-.evaluateDialog {
-  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: 600px;
-      height: 250px;
-      display: flex;
-      justify-content: space-between;
-      padding: 10px 40px;
-      border: 1px solid #000;
-
-      .img-item {
-        width: 178px;
-        height: 200px;
-
-        .title-box {
-          display: flex;
-          justify-content: space-between;
-
-          .img-title {
-            width: 150px;
-            white-space: nowrap;
-            overflow: hidden;
-            text-overflow: ellipsis;
-            margin-right: 20px;
-          }
-
-          .img-btn {
-            .btn {
-              padding: 0;
-            }
-          }
-        }
-      }
-    }
-  }
-
-  .btnBox {
-    padding: 30px;
-    box-sizing: border-box;
-    display: flex;
-    align-items: center;
-    justify-content: space-evenly;
-
-    .save,
-    .close {
-      width: 100px;
-    }
-
-  }
-}
-
-.avatar-uploader .el-upload {
-  border: 1px dashed #d9d9d9;
-  border-radius: 6px;
-  cursor: pointer;
-  position: relative;
-  overflow: hidden;
-}
-
-.avatar-uploader .el-upload:hover {
-  border-color: #409EFF;
-}
-
-.avatar-uploader-icon {
-  font-size: 28px;
-  color: #8c939d;
-  width: 178px;
-  height: 178px;
-  line-height: 178px;
-  text-align: center;
-}
-
-.avatar {
-  width: 178px;
-  height: 178px;
-  display: block;
-}
-</style>
diff --git a/src/components/mycomponent/dialog/historyAssessDialog.vue b/src/components/mycomponent/dialog/historyAssessDialog.vue
deleted file mode 100644
index 30a0c57..0000000
--- a/src/components/mycomponent/dialog/historyAssessDialog.vue
+++ /dev/null
@@ -1,146 +0,0 @@
-<!--历史考核弹窗-->
-<template>
-  <div class="historyAssessDialog dialog">
-    <dialog-header title="历史考核" @close="close" />
-    <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="assessAnnualName" label="考核年度" width="150" />
-        <el-table-column prop="annualAssessResultName" label="年度考核结果" width="150" />
-        <el-table-column prop="annualAssessIllustration" label="年度考核说明" width="150" />
-        <el-table-column prop="annualAssessDate" label="年度考核时间" width="150" />
-        <el-table-column prop="annualAssessFile" 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>
-</template>
-
-<script>
-import dialogHeader from './dialogHeader.vue'
-import inputVue from '../input/inputVue.vue'
-import RedStar from '../redStar.vue'
-
-import { historyAssess } from '../../../api/supplier/supplier'
-
-export default {
-  components: { inputVue, dialogHeader, RedStar },
-  props: {
-    dataInfo: {
-      type: Object,
-      dataInfo: {}
-    }
-  },
-  data() {
-    return {
-      tableData: []
-    }
-  },
-  mounted() {
-    this.getHistoryAssess()
-  },
-  methods: {
-    // 生成序号
-    indexMethod(index) {
-      return index + 1
-    },
-    // 合并表头
-    headerStyle({ row, column, rowIndex, columnIndex }) {
-      row[5].colSpan = 2 // 第三列的表头占据2个单元格
-      row[6].colSpan = 0
-      if (columnIndex === 6) {
-        return 'display: none'
-      }
-    },
-    close() {
-      this.$emit('close')
-    },
-    getHistoryAssess() {
-      historyAssess().then(res => {
-        console.log(res)
-        this.tableData = res
-      })
-    }
-  }
-}
-</script>
-
-<style lang='scss' scoped>
-.historyAssessDialog {
-  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 {
-    margin: 20px;
-  }
-
-}
-</style>
diff --git a/src/components/mycomponent/dialog/historyEvaluateDialog.vue b/src/components/mycomponent/dialog/historyEvaluateDialog.vue
deleted file mode 100644
index 8fce92f..0000000
--- a/src/components/mycomponent/dialog/historyEvaluateDialog.vue
+++ /dev/null
@@ -1,148 +0,0 @@
-<!--历史评价弹窗-->
-<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>
-</template>
-
-<script>
-import dialogHeader from './dialogHeader.vue'
-import inputVue from '../input/inputVue.vue'
-import RedStar from '../redStar.vue'
-
-import { historyEvaluate } from '../../../api/supplier/supplier'
-
-export default {
-  components: { inputVue, dialogHeader, RedStar },
-  props: {
-    dataInfo: {
-      type: Object,
-      dataInfo: {}
-    }
-  },
-  data() {
-    return {
-      isShowInfo: true,
-      tableData: []
-    }
-  },
-  mounted() {
-    this.getHistoryEvaluate()
-  },
-  methods: {
-    // 生成序号
-    indexMethod(index) {
-      return index + 1
-    },
-    // 合并表头
-    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)
-        this.tableData = res
-      })
-    }
-  }
-}
-</script>
-
-<style lang='scss' scoped>
-.historyEvaluateDialog {
-  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 {
-        display: flex;
-        justify-content: inherit;
-        align-items: center;
-      }
-    }
-
-  }
-
-  .Dialog-table {
-    margin: 20px;
-  }
-
-}
-</style>
diff --git a/src/views/supplier/assess.vue b/src/views/supplier/assess.vue
index 5315ce9..aa1b324 100644
--- a/src/views/supplier/assess.vue
+++ b/src/views/supplier/assess.vue
@@ -86,8 +86,8 @@
 
 <script>
 import GroupPage from '../../components/mycomponent/groupPage.vue'
-import assessDialog from '../../components/mycomponent/dialog/assessDialog.vue'
-import historyAssessDialog from '../../components/mycomponent/dialog/historyAssessDialog.vue'
+import assessDialog from './assessDialog.vue'
+import historyAssessDialog from './historyAssessDialog.vue'
 
 import { a_list } from '../../api/supplier/supplier'
 import { tableRowClassName } from '../../utils/myUtils/changeTableTr'
diff --git a/src/views/supplier/assessDialog.vue b/src/views/supplier/assessDialog.vue
new file mode 100644
index 0000000..fd4bc00
--- /dev/null
+++ b/src/views/supplier/assessDialog.vue
@@ -0,0 +1,368 @@
+<!--年度考核弹窗-->
+<template>
+  <el-dialog title="年度考核" width="975px" :visible.sync="isShowInfo" append-to-body @close="close">
+    <div class="assessDialog">
+      <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.assessAnnual" clearable placeholder="请选择" style="width:200px">
+                <el-option v-for="item in yearOptions" :key="item.value" :label="item.label" :value="item.value" />
+              </el-select>
+            </input-vue>
+          </div>
+          <div class="inputBox">
+            <input-vue
+              v-model="addInfo.annualAssessIllustration"
+              title="年度考核说明"
+              class="inputWidth"
+              placeholder="请输入年度考核说明"
+              width="200px"
+            />
+          </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">
+            <red-star />
+            <input-vue title="考核结果" class="inputWidth">
+              <el-select v-model="addInfo.annualAssessResult" clearable placeholder="请选择" style="width:200px">
+                <el-option v-for="item in resultOptions" :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.annualAssessDate"
+                placeholder="请选择日期"
+                suffix-icon="el-icon-date"
+                style="width:200px"
+              />
+            </input-vue>
+          </div>
+        </div>
+      </div>
+      <div class="imgContent">
+        <div class="img-box">
+          <div class="img-item">
+            <div v-if="fileName" class="title-box">
+              <div class="img-title">
+                {{ fileName }}
+              </div>
+              <div class="img-btn">
+                <el-button type="text" class="btn">
+                  下载
+                </el-button>
+              </div>
+            </div>
+            <el-upload
+              class="avatar-uploader"
+              :headers="myHeaders"
+              action="http://111.198.10.15:21403/file/uploadFile"
+              :show-file-list="false"
+              :on-success="handleAvatarSuccess"
+              :before-upload="beforeAvatarUpload"
+            >
+              <img v-if="imageUrl" :src="imageUrl" class="avatar">
+              <i v-else class="el-icon-plus avatar-uploader-icon" />
+            </el-upload>
+          </div>
+          <div class="img-item">
+            <div v-if="fileName2" class="title-box">
+              <div class="img-title">
+                {{ fileName2 }}
+              </div>
+              <div class="img-btn">
+                <el-button type="text" class="btn">
+                  下载
+                </el-button>
+              </div>
+            </div>
+            <el-upload
+              class="avatar-uploader"
+              :headers="myHeaders"
+              action="http://111.198.10.15:21403/file/uploadFile"
+              :show-file-list="false"
+              :on-success="handleAvatarSuccess2"
+              :before-upload="beforeAvatarUpload"
+            >
+              <img v-if="imageUrl2" :src="imageUrl2" class="avatar">
+              <i v-else class="el-icon-plus avatar-uploader-icon" />
+            </el-upload>
+          </div>
+        </div>
+        <div class="uploadbtn">
+          <el-button type="primary">
+            上传录库评审结果
+          </el-button>
+        </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 '../../components/mycomponent/dialog/dialogHeader.vue'
+import inputVue from '../../components/mycomponent/input/inputVue.vue'
+import RedStar from '../../components/mycomponent/redStar.vue'
+
+import { getToken } from '@/utils/auth'
+import { Message } from 'element-ui'
+import { assessAdd } from '../../api/supplier/supplier'
+export default {
+  name: 'AssessDialog',
+  components: { inputVue, dialogHeader, RedStar },
+  props: {
+    assessAnnualOpts: {
+      type: Array,
+      default() {
+        return []
+      },
+      required: true
+    }
+  },
+  data() {
+    return {
+      fileName: '',
+      imageUrl: '',
+      imageUrl2: '',
+      fileName2: '',
+      myHeaders: { token: getToken() },
+      isShowInfo: true,
+      yearOptions: [
+        { label: '2021', value: '2021' },
+        { label: '2022', value: '2022' }
+      ],
+      resultOptions: [
+        { label: 'A', value: 'A' },
+        { label: 'B', value: 'B' },
+        { label: 'C', value: 'C' }
+      ],
+      addInfo: {
+        supplierCode: '',
+        supplierName: '',
+        assessAnnual: '',
+        annualAssessResult: '',
+        annualAssessIllustration: '',
+        annualAssessDate: '',
+        annualAssessFile: ''
+      }
+    }
+  },
+  watch: {
+    dataInfo: {
+      handler(val) {
+        console.log(val)
+        if (val != '') {
+          const temp = { ...this.addInfo }
+          this.addInfo = {
+            supplierCode: val.supplierCode,
+            supplierName: val.supplierName,
+            assessAnnual: temp.assessAnnual,
+            annualAssessResult: temp.annualAssessResult,
+            annualAssessIllustration: temp.annualAssessIllustration,
+            annualAssessDate: temp.annualAssessDate,
+            annualAssessFile: temp.annualAssessFile
+          }
+          console.log(this.addInfo)
+        }
+      },
+      deep: true,
+      immediate: true
+    }
+  },
+  methods: {
+    close() {
+      this.$emit('close')
+    },
+    // 照片上传
+    handleAvatarSuccess(res, file) {
+      this.fileName = res.data.fileName
+      console.log(res, file)
+      this.imageUrl = URL.createObjectURL(file.raw)
+      console.log(this.addInfo.annualAssessFile, 'this.addInfo.annualAssessFile')
+      if (this.addInfo.annualAssessFile == '') {
+        console.log('1')
+        this.addInfo.annualAssessFile = res.data.fileId
+      } else {
+        console.log('2')
+        this.addInfo.annualAssessFile = this.addInfo.annualAssessFile + ',' + res.data.fileId
+      }
+      console.log(this.addInfo.annualAssessFile)
+    },
+    handleAvatarSuccess2(res, file) {
+      this.fileName2 = res.data.fileName
+      console.log(res, file)
+      this.imageUrl2 = URL.createObjectURL(file.raw)
+      if (this.addInfo.annualAssessFile == '') {
+        console.log('3')
+        this.addInfo.annualAssessFile = res.data.fileId
+      } else {
+        console.log('4')
+        this.addInfo.annualAssessFile = this.addInfo.annualAssessFile + ',' + res.data.fileId
+      }
+      console.log(this.addInfo.annualAssessFile)
+    },
+    beforeAvatarUpload(file) {
+      const isJPG = file.type === 'image/jpeg'
+      const isLt2M = file.size / 1024 / 1024 < 2
+
+      if (!isJPG) {
+        this.$message.error('上传头像图片只能是 JPG 格式!')
+      }
+      if (!isLt2M) {
+        this.$message.error('上传头像图片大小不能超过 2MB!')
+      }
+      return isJPG && isLt2M
+    },
+    save() {
+      assessAdd(this.addInfo).then(res => {
+        console.log(res)
+        if (!res.code) {
+          this.close()
+          Message.success('保存成功')
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style lang='scss' scoped>
+.assessDialog {
+  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: 600px;
+      height: 250px;
+      display: flex;
+      justify-content: space-between;
+      padding: 10px 40px;
+      border: 1px solid #000;
+
+      .img-item {
+        width: 178px;
+        height: 200px;
+
+        .title-box {
+          display: flex;
+          justify-content: space-between;
+
+          .img-title {
+            width: 150px;
+            white-space: nowrap;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            margin-right: 20px;
+          }
+
+          .img-btn {
+            .btn {
+              padding: 0;
+            }
+          }
+        }
+      }
+    }
+  }
+
+  .btnBox {
+    padding: 30px;
+    box-sizing: border-box;
+    display: flex;
+    align-items: center;
+    justify-content: space-evenly;
+
+    .save,
+    .close {
+      width: 100px;
+    }
+
+  }
+}
+
+.avatar-uploader .el-upload {
+  border: 1px dashed #d9d9d9;
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+}
+
+.avatar-uploader .el-upload:hover {
+  border-color: #409EFF;
+}
+
+.avatar-uploader-icon {
+  font-size: 28px;
+  color: #8c939d;
+  width: 178px;
+  height: 178px;
+  line-height: 178px;
+  text-align: center;
+}
+
+.avatar {
+  width: 178px;
+  height: 178px;
+  display: block;
+}
+</style>
diff --git a/src/views/supplier/evaluate.vue b/src/views/supplier/evaluate.vue
index f3ee896..7653a58 100644
--- a/src/views/supplier/evaluate.vue
+++ b/src/views/supplier/evaluate.vue
@@ -3,33 +3,26 @@
   <div class="evaluate">
     <div class="evaluate-inputs">
       供应商编号
-      <el-input
-        v-model="selectInfo.supplierCode"
-        style="width: 200px"
-        placeholder="请输入编号"
-        clearable
-        class="evaluate-input"
-      />
+      <el-input v-model="selectInfo.supplierCode" style="width: 200px" placeholder="请输入编号" clearable class="evaluate-input"/>
 
       供应商名称
-      <el-input
-        v-model="selectInfo.supplierName"
-        style="width: 200px"
-        placeholder="请输入供应商名称"
-        clearable
-        class="evaluate-input"
-      />
+      <el-input v-model="selectInfo.supplierName" style="width: 200px" placeholder="请输入供应商名称" clearable class="evaluate-input"/>
 
-      评价时间
-      <el-select
-        v-model="selectInfo.evaluateQuarterly"
-        class="evaluate-select"
-        filterable
-        placeholder="请选择结果"
-        style="width: 200px"
-      >
-        <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
+      年份
+      <el-select v-model="selectInfo.evaluateYear" class="evaluate-select" clearable placeholder="请选择年份" style="width: 150px">
+        <el-option v-for="item in evaluateAnnualOpts" :key="item.id" :label="item.name" :value="item.value" />
       </el-select>
+
+      季度
+      <el-select v-model="selectInfo.evaluateQuarterly" class="evaluate-select" clearable placeholder="请选择季度" style="width: 150px">
+        <el-option v-for="item in evaluateQuarterlyOpts" :key="item.id" :label="item.name" :value="item.value" />
+      </el-select>
+
+      评价结果
+      <el-select v-model="selectInfo.quarterlyEvaluateResult" class="evaluate-select" clearable placeholder="请选择评价结果" style="width: 150px">
+        <el-option v-for="item in evaluateResultOpts" :key="item.id" :label="item.name" :value="item.value" />
+      </el-select>
+
       <div class="evaluate-btns">
         <el-button type="primary" class="evaluate-button" @click="selectData">
           查询
@@ -51,14 +44,18 @@
         :row-style="{ 'text-align': 'center' }"
         style="width: 100%"
       >
-        <el-table-column type="index" label="序号" width="180" />
-        <el-table-column prop="supplierCode" label="供应商编号" width="180" />
-        <el-table-column prop="supplierName" label="供应商名称" />
-        <el-table-column prop="supplierStatusName" label="供应商状态" />
-        <el-table-column prop="evaluateQuarterlyName" label="最新季度评价" />
-        <el-table-column prop="quarterlyEvaluateResult" label="季度评价结果" />
-        <el-table-column prop="quarterlyEvaluateDate" label="季度评价日期" />
-        <el-table-column header-align="center" align="center" fixed="right" label="操作">
+        <el-table-column type="index" label="序号" width="100" />
+        <el-table-column prop="supplierCode" label="供应商编号" width="200" />
+        <el-table-column prop="supplierName" label="供应商名称" width="400" />
+        <el-table-column prop="supplierStatusName" label="供应商状态" width="100" />
+        <el-table-column label="最新评价季度">
+          <template v-if="scope.row.evaluateYearName !== ''" slot-scope="scope">
+            {{ scope.row.evaluateYearName }}年{{ scope.row.evaluateQuarterlyName }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="quarterlyEvaluateResultName" label="季度评价结果" width="150" />
+        <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)">
               历史评价
@@ -80,21 +77,29 @@
       />
     </div>
     <historyEvaluateDialog v-if="isShowHistoryDialog" :data-info="dataInfo" @close="evaluateHistoryDialogClose" />
-    <evaluateDialog v-if="isShowDialog" :data-info="dataInfo" @close="evaluateDialogClose" />
+    <evaluate-dialog
+      ref="evaluateDialog"
+                     @refreshList="selectData"
+                     :evaluate-annual-opts="evaluateAnnualOpts"
+                     :evaluate-quarterly-opts="evaluateQuarterlyOpts"
+                     :evaluate-result-opts="evaluateResultOpts"
+    />
   </div>
 </template>
 
 <script>
 import GroupPage from '../../components/mycomponent/groupPage.vue'
-import evaluateDialog from '../../components/mycomponent/dialog/evaluateDialog.vue'
-import historyEvaluateDialog from '../../components/mycomponent/dialog/historyEvaluateDialog.vue'
+import EvaluateDialog from '@/views/supplier/evaluateDialog'
+import historyEvaluateDialog from './historyEvaluateDialog.vue'
 
 import { e_list } from '../../api/supplier/supplier'
 import { tableRowClassName } from '../../utils/myUtils/changeTableTr'
 import { listMixin } from '../../utils/myUtils/mixins/listPage'
+import { getDictByCode } from '@/api/system/dict'
+
 export default { // 加入分页逻辑
   components: {
-    historyEvaluateDialog, evaluateDialog, GroupPage
+    historyEvaluateDialog, EvaluateDialog, GroupPage
   },
   mixins: [listMixin],
   data() {
@@ -105,18 +110,43 @@
       selectInfo: {
         supplierCode: '',
         supplierName: '',
-        evaluateQuarterly: ''
+        evaluateYear: '',
+        evaluateQuarterly: '',
+        quarterlyEvaluateResult: ''
       },
-      options: [
-        { label: '2022第一季度', value: '2022第一季度' },
-        { label: '2021第二季度', value: '2021第二季度' }
-      ]
+      evaluateAnnualOpts: [],
+      evaluateQuarterlyOpts: [],
+      evaluateResultOpts: []
     }
   },
   mounted() {
+    this.getDictEvaluateAnnual()
+    this.getDictEvaluateQuarterly()
+    this.getDictEvaluateResult()
   },
   methods: {
     tableRowClassName: tableRowClassName,
+    getDictEvaluateAnnual() {
+      getDictByCode('assessAnnual').then(response => {
+        if (response.code === 200) {
+          this.evaluateAnnualOpts = response.data
+        }
+      })
+    },
+    getDictEvaluateQuarterly() {
+      getDictByCode('evaluateQuarterly').then(response => {
+        if (response.code === 200) {
+          this.evaluateQuarterlyOpts = response.data
+        }
+      })
+    },
+    getDictEvaluateResult() {
+      getDictByCode('evaluateResult').then(response => {
+        if (response.code === 200) {
+          this.evaluateResultOpts = response.data
+        }
+      })
+    },
     hitstoryDialog(row) {
       this.dataInfo = row
       this.isShowHistoryDialog = true
@@ -128,10 +158,9 @@
       this.isShowDialog = false
     },
     evaluateDialogClick(row) {
-      this.dataInfo = row
-      this.isShowDialog = true
+      this.$refs.evaluateDialog.initDialog(row)
     },
-    getListPage(limit, offset) {
+    getListPage(limit = 10, offset = 1) {
       e_list(`limit=${limit}&offset=${offset}`, this.queryInfo).then(res => {
         console.log(res)
         this.tableData = res
@@ -141,7 +170,9 @@
       this.selectInfo = { // 搜索框中的数据的数据
         supplierCode: '',
         supplierName: '',
-        evaluateQuarterly: ''
+        evaluateYear: '',
+        evaluateQuarterly: '',
+        quarterlyEvaluateResult: ''
       }
     }
   }
@@ -166,7 +197,7 @@
   }
 
   .evaluate-select {
-    margin: 0 4rem 0 0.5rem;
+    margin: 0 1rem 0 0.5rem;
   }
 
   .evaluate-btns {
diff --git a/src/views/supplier/evaluateDialog.vue b/src/views/supplier/evaluateDialog.vue
new file mode 100644
index 0000000..b217191
--- /dev/null
+++ b/src/views/supplier/evaluateDialog.vue
@@ -0,0 +1,309 @@
+<!--季度评价弹窗-->
+<template>
+  <el-dialog title="季度评价" width="975px" :visible.sync="isShowInfo" append-to-body @close="close">
+    <el-form ref="evaluateForm" :model="addInfo" :rules="evaluateRules" 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="evaluateYear">
+            <el-select v-model="addInfo.evaluateYear" clearable placeholder="请选择年份" style="width: 100%">
+              <el-option v-for="item in evaluateAnnualOpts" :key="item.id" :label="item.name" :value="item.value" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="10">
+          <el-form-item label="季度" prop="evaluateQuarterly">
+            <el-select v-model="addInfo.evaluateQuarterly" clearable placeholder="请选择季度" style="width: 100%">
+              <el-option v-for="item in evaluateQuarterlyOpts" :key="item.id" :label="item.name" :value="item.value" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="10">
+          <el-form-item label="评审结果" prop="quarterlyEvaluateResult">
+            <el-select v-model="addInfo.quarterlyEvaluateResult" clearable placeholder="请选择评价结果" style="width: 100%">
+              <el-option v-for="item in evaluateResultOpts" :key="item.id" :label="item.name" :value="item.value" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="10">
+          <el-form-item label="评审日期" prop="quarterlyEvaluateDate">
+            <el-date-picker v-model="addInfo.quarterlyEvaluateDate" 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="评审结果说明">
+            <el-input v-model="addInfo.quarterlyEvaluateIllustration" 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="evaluateFile"
+              action="action"
+              :file-list="quarterlyEvaluateFileList"
+              :http-request="uploadQuarterlyEvaluateFile"
+              :before-upload="handleBeforeUpload"
+              :on-remove="handleQuarterlyEvaluateFileRemove"
+              :on-exceed="quarterlyEvaluateFileExceed"
+              :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="evaluateDialog">
+      <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 { evaluateAdd } from '@/api/supplier/supplier'
+import { Uploadimg } from '@/api/common'
+import { getToday } from '@/utils/dateutils'
+
+export default {
+  name: 'EvaluateDialog',
+  props: {
+    evaluateAnnualOpts: {
+      type: Array,
+      default() {
+        return []
+      },
+      required: true
+    },
+    evaluateQuarterlyOpts: {
+      type: Array,
+      default() {
+        return []
+      },
+      required: true
+    },
+    evaluateResultOpts: {
+      type: Array,
+      default() {
+        return []
+      },
+      required: true
+    }
+  },
+  data() {
+    return {
+      isShowInfo: false,
+      quarterOptions: [
+        { label: '2021第一季度', value: '2021第一季度' },
+        { label: '2021第二季度', value: '2021第二季度' }
+      ],
+      resultOptions: [
+        { label: 'A', value: 'A' },
+        { label: 'B', value: 'B' },
+        { label: 'C', value: 'C' }
+      ],
+      addInfo: {
+        supplierCode: '',
+        supplierName: '',
+        evaluateYear: '',
+        evaluateQuarterly: '',
+        quarterlyEvaluateResult: '',
+        quarterlyEvaluateIllustration: '',
+        quarterlyEvaluateDate: '',
+        quarterlyEvaluateFile: ''
+      },
+      evaluateRules: {
+        evaluateYear: [{ required: true, message: '请选择评价年份', trigger: 'change' }],
+        evaluateQuarterly: [{ required: true, message: '请选择评价季度', trigger: 'change' }],
+        quarterlyEvaluateResult: [{ required: true, message: '请选择评价结果', trigger: 'change' }],
+        quarterlyEvaluateDate: [{ required: true, message: '请选择评价日期', trigger: 'blur' }]
+      },
+      quarterlyEvaluateFileList: [],
+      evaluateValid: 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.quarterlyEvaluateDate = getToday('yyyy-MM-dd')
+      }
+    },
+    save() {
+      this.validateForm()
+      if (this.evaluateValid === true) {
+        if (this.quarterlyEvaluateFileList.length > 0) {
+          for (const i in this.quarterlyEvaluateFileList) {
+            this.addInfo.quarterlyEvaluateFile += this.quarterlyEvaluateFileList[i].url + ','
+          }
+
+          this.addInfo.quarterlyEvaluateFile = this.addInfo.quarterlyEvaluateFile.substring(0, this.addInfo.quarterlyEvaluateFile.length - 1)
+        }
+
+        evaluateAdd(this.addInfo).then(res => {
+          if (!res.code) {
+            this.$message.success('保存成功')
+            this.clearForm()
+            this.close()
+          }
+        })
+      }
+    },
+    validateForm: function() {
+      this.$refs.evaluateForm.validate(valid => {
+        this.evaluateValid = valid
+      })
+    },
+    clearForm() {
+      this.addInfo = {
+        supplierCode: '',
+        supplierName: '',
+        evaluateYear: '',
+        evaluateQuarterly: '',
+        quarterlyEvaluateResult: '',
+        quarterlyEvaluateIllustration: '',
+        quarterlyEvaluateDate: '',
+        quarterlyEvaluateFile: ''
+      }
+      this.quarterlyEvaluateFileList = []
+      // 清除验证
+      this.$nextTick(() => {
+        this.$refs.evaluateForm.clearValidate()
+      })
+    },
+    uploadQuarterlyEvaluateFile(file) {
+      // 判断文件是否已经上传过
+      for (const i in this.quarterlyEvaluateFileList) {
+        if (this.quarterlyEvaluateFileList[i].name === file.name) {
+          this.$message.error('该文件已上传过，请选择其他文件')
+          this.handleFileNotUploaded(file, this.$refs.evaluateFile.uploadFiles)
+          return
+        }
+      }
+
+      Uploadimg(file).then(res => {
+        if (res.code === 200) {
+          this.quarterlyEvaluateFileList.push({
+            name: res.data.fileName,
+            url: res.data.fileId,
+            type: file.file.type
+          })
+          this.$message.success('文件上传成功')
+        }
+      })
+    },
+    handleQuarterlyEvaluateFileRemove(file) {
+      this.handleRemove(file, this.quarterlyEvaluateFileList)
+    },
+    quarterlyEvaluateFileExceed(file, fileList) {
+      this.handleExceed(file, this.quarterlyEvaluateFileList)
+    },
+    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>
+.evaluateDialog {
+  width: 975px;
+  padding: 0 20px;
+  box-sizing: border-box;
+
+  .btnBox {
+    padding: 30px;
+    box-sizing: border-box;
+    display: flex;
+    align-items: center;
+    justify-content: space-evenly;
+
+    .save,
+    .close {
+      width: 200px;
+    }
+
+  }
+}
+</style>
diff --git a/src/views/supplier/historyAssessDialog.vue b/src/views/supplier/historyAssessDialog.vue
new file mode 100644
index 0000000..83694dd
--- /dev/null
+++ b/src/views/supplier/historyAssessDialog.vue
@@ -0,0 +1,146 @@
+<!--历史考核弹窗-->
+<template>
+  <div class="historyAssessDialog dialog">
+    <dialog-header title="历史考核" @close="close" />
+    <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="assessAnnualName" label="考核年度" width="150" />
+        <el-table-column prop="annualAssessResultName" label="年度考核结果" width="150" />
+        <el-table-column prop="annualAssessIllustration" label="年度考核说明" width="150" />
+        <el-table-column prop="annualAssessDate" label="年度考核时间" width="150" />
+        <el-table-column prop="annualAssessFile" 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>
+</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 { historyAssess } from '../../api/supplier/supplier'
+
+export default {
+  components: { inputVue, dialogHeader, RedStar },
+  props: {
+    dataInfo: {
+      type: Object,
+      dataInfo: {}
+    }
+  },
+  data() {
+    return {
+      tableData: []
+    }
+  },
+  mounted() {
+    this.getHistoryAssess()
+  },
+  methods: {
+    // 生成序号
+    indexMethod(index) {
+      return index + 1
+    },
+    // 合并表头
+    headerStyle({ row, column, rowIndex, columnIndex }) {
+      row[5].colSpan = 2 // 第三列的表头占据2个单元格
+      row[6].colSpan = 0
+      if (columnIndex === 6) {
+        return 'display: none'
+      }
+    },
+    close() {
+      this.$emit('close')
+    },
+    getHistoryAssess() {
+      historyAssess().then(res => {
+        console.log(res)
+        this.tableData = res
+      })
+    }
+  }
+}
+</script>
+
+<style lang='scss' scoped>
+.historyAssessDialog {
+  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 {
+    margin: 20px;
+  }
+
+}
+</style>
diff --git a/src/views/supplier/historyEvaluateDialog.vue b/src/views/supplier/historyEvaluateDialog.vue
new file mode 100644
index 0000000..092fc37
--- /dev/null
+++ b/src/views/supplier/historyEvaluateDialog.vue
@@ -0,0 +1,148 @@
+<!--历史评价弹窗-->
+<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>
+</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'
+
+export default {
+  components: { inputVue, dialogHeader, RedStar },
+  props: {
+    dataInfo: {
+      type: Object,
+      dataInfo: {}
+    }
+  },
+  data() {
+    return {
+      isShowInfo: true,
+      tableData: []
+    }
+  },
+  mounted() {
+    this.getHistoryEvaluate()
+  },
+  methods: {
+    // 生成序号
+    indexMethod(index) {
+      return index + 1
+    },
+    // 合并表头
+    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)
+        this.tableData = res
+      })
+    }
+  }
+}
+</script>
+
+<style lang='scss' scoped>
+.historyEvaluateDialog {
+  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 {
+        display: flex;
+        justify-content: inherit;
+        align-items: center;
+      }
+    }
+
+  }
+
+  .Dialog-table {
+    margin: 20px;
+  }
+
+}
+</style>
diff --git a/src/views/supplier/inquiryDialog.vue b/src/views/supplier/inquiryDialog.vue
index 35f16c5..ff65c25 100644
--- a/src/views/supplier/inquiryDialog.vue
+++ b/src/views/supplier/inquiryDialog.vue
@@ -52,7 +52,7 @@
               :file-list="preReviewFileList"
               :http-request="uploadPreReviewFile"
               :before-upload="handleBeforeUpload"
-              :on-remove="handlePreReviewFileFileRemove"
+              :on-remove="handlePreReviewFileRemove"
               :on-exceed="preReviewFileExceed"
               :on-preview="handlePreview"
               :limit="5"
@@ -199,7 +199,7 @@
         }
       })
     },
-    handlePreReviewFileFileRemove(file) {
+    handlePreReviewFileRemove(file) {
       this.handleRemove(file, this.preReviewFileList)
     },
     preReviewFileExceed(file, fileList) {

diff --git a/src/api/supplier/supplier.js b/src/api/supplier/supplier.js
index 0fd037c..fe31ad0 100644
--- a/src/api/supplier/supplier.js
+++ b/src/api/supplier/supplier.js
@@ -48,7 +48,7 @@
 
 // 新增
 const evaluateAdd = (data) => {
-  return instance.post('/supplierInputReview/add', data)
+  return instance.post('/supplierQuarterlyEvaluate/add', data)
 }
 
 // 年度考核不分页列表
diff --git a/src/components/mycomponent/dialog/assessDialog.vue b/src/components/mycomponent/dialog/assessDialog.vue
deleted file mode 100644
index 5bb387d..0000000
--- a/src/components/mycomponent/dialog/assessDialog.vue
+++ /dev/null
@@ -1,364 +0,0 @@
-<!--年度考核弹窗-->
-<template>
-  <el-dialog title="年度考核" width="975px" :visible.sync="isShowInfo" append-to-body @close="close">
-    <div class="assessDialog">
-      <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.assessAnnual" clearable placeholder="请选择" style="width:200px">
-                <el-option v-for="item in yearOptions" :key="item.value" :label="item.label" :value="item.value" />
-              </el-select>
-            </input-vue>
-          </div>
-          <div class="inputBox">
-            <input-vue
-              v-model="addInfo.annualAssessIllustration"
-              title="年度考核说明"
-              class="inputWidth"
-              placeholder="请输入年度考核说明"
-              width="200px"
-            />
-          </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">
-            <red-star />
-            <input-vue title="考核结果" class="inputWidth">
-              <el-select v-model="addInfo.annualAssessResult" clearable placeholder="请选择" style="width:200px">
-                <el-option v-for="item in resultOptions" :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.annualAssessDate"
-                placeholder="请选择日期"
-                suffix-icon="el-icon-date"
-                style="width:200px"
-              />
-            </input-vue>
-          </div>
-        </div>
-      </div>
-      <div class="imgContent">
-        <div class="img-box">
-          <div class="img-item">
-            <div v-if="fileName" class="title-box">
-              <div class="img-title">
-                {{ fileName }}
-              </div>
-              <div class="img-btn">
-                <el-button type="text" class="btn">
-                  下载
-                </el-button>
-              </div>
-            </div>
-            <el-upload
-              class="avatar-uploader"
-              :headers="myHeaders"
-              action="http://111.198.10.15:21403/file/uploadFile"
-              :show-file-list="false"
-              :on-success="handleAvatarSuccess"
-              :before-upload="beforeAvatarUpload"
-            >
-              <img v-if="imageUrl" :src="imageUrl" class="avatar">
-              <i v-else class="el-icon-plus avatar-uploader-icon" />
-            </el-upload>
-          </div>
-          <div class="img-item">
-            <div v-if="fileName2" class="title-box">
-              <div class="img-title">
-                {{ fileName2 }}
-              </div>
-              <div class="img-btn">
-                <el-button type="text" class="btn">
-                  下载
-                </el-button>
-              </div>
-            </div>
-            <el-upload
-              class="avatar-uploader"
-              :headers="myHeaders"
-              action="http://111.198.10.15:21403/file/uploadFile"
-              :show-file-list="false"
-              :on-success="handleAvatarSuccess2"
-              :before-upload="beforeAvatarUpload"
-            >
-              <img v-if="imageUrl2" :src="imageUrl2" class="avatar">
-              <i v-else class="el-icon-plus avatar-uploader-icon" />
-            </el-upload>
-          </div>
-        </div>
-        <div class="uploadbtn">
-          <el-button type="primary">
-            上传录库评审结果
-          </el-button>
-        </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 { getToken } from '@/utils/auth'
-import { Message } from 'element-ui'
-import { assessAdd } from '../../../api/supplier/supplier'
-export default {
-  components: { inputVue, dialogHeader, RedStar },
-  props: {
-    dataInfo: {
-      type: Object,
-      dataInfo: {}
-    }
-  },
-  data() {
-    return {
-      fileName: '',
-      imageUrl: '',
-      imageUrl2: '',
-      fileName2: '',
-      myHeaders: { token: getToken() },
-      isShowInfo: true,
-      yearOptions: [
-        { label: '2021', value: '2021' },
-        { label: '2022', value: '2022' }
-      ],
-      resultOptions: [
-        { label: 'A', value: 'A' },
-        { label: 'B', value: 'B' },
-        { label: 'C', value: 'C' }
-      ],
-      addInfo: {
-        supplierCode: '',
-        supplierName: '',
-        assessAnnual: '',
-        annualAssessResult: '',
-        annualAssessIllustration: '',
-        annualAssessDate: '',
-        annualAssessFile: ''
-      }
-    }
-  },
-  watch: {
-    dataInfo: {
-      handler(val) {
-        console.log(val)
-        if (val != '') {
-          const temp = { ...this.addInfo }
-          this.addInfo = {
-            supplierCode: val.supplierCode,
-            supplierName: val.supplierName,
-            assessAnnual: temp.assessAnnual,
-            annualAssessResult: temp.annualAssessResult,
-            annualAssessIllustration: temp.annualAssessIllustration,
-            annualAssessDate: temp.annualAssessDate,
-            annualAssessFile: temp.annualAssessFile
-          }
-          console.log(this.addInfo)
-        }
-      },
-      deep: true,
-      immediate: true
-    }
-  },
-  methods: {
-    close() {
-      this.$emit('close')
-    },
-    // 照片上传
-    handleAvatarSuccess(res, file) {
-      this.fileName = res.data.fileName
-      console.log(res, file)
-      this.imageUrl = URL.createObjectURL(file.raw)
-      console.log(this.addInfo.annualAssessFile, 'this.addInfo.annualAssessFile')
-      if (this.addInfo.annualAssessFile == '') {
-        console.log('1')
-        this.addInfo.annualAssessFile = res.data.fileId
-      } else {
-        console.log('2')
-        this.addInfo.annualAssessFile = this.addInfo.annualAssessFile + ',' + res.data.fileId
-      }
-      console.log(this.addInfo.annualAssessFile)
-    },
-    handleAvatarSuccess2(res, file) {
-      this.fileName2 = res.data.fileName
-      console.log(res, file)
-      this.imageUrl2 = URL.createObjectURL(file.raw)
-      if (this.addInfo.annualAssessFile == '') {
-        console.log('3')
-        this.addInfo.annualAssessFile = res.data.fileId
-      } else {
-        console.log('4')
-        this.addInfo.annualAssessFile = this.addInfo.annualAssessFile + ',' + res.data.fileId
-      }
-      console.log(this.addInfo.annualAssessFile)
-    },
-    beforeAvatarUpload(file) {
-      const isJPG = file.type === 'image/jpeg'
-      const isLt2M = file.size / 1024 / 1024 < 2
-
-      if (!isJPG) {
-        this.$message.error('上传头像图片只能是 JPG 格式!')
-      }
-      if (!isLt2M) {
-        this.$message.error('上传头像图片大小不能超过 2MB!')
-      }
-      return isJPG && isLt2M
-    },
-    save() {
-      assessAdd(this.addInfo).then(res => {
-        console.log(res)
-        if (!res.code) {
-          this.close()
-          Message.success('保存成功')
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style lang='scss' scoped>
-.assessDialog {
-  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: 600px;
-      height: 250px;
-      display: flex;
-      justify-content: space-between;
-      padding: 10px 40px;
-      border: 1px solid #000;
-
-      .img-item {
-        width: 178px;
-        height: 200px;
-
-        .title-box {
-          display: flex;
-          justify-content: space-between;
-
-          .img-title {
-            width: 150px;
-            white-space: nowrap;
-            overflow: hidden;
-            text-overflow: ellipsis;
-            margin-right: 20px;
-          }
-
-          .img-btn {
-            .btn {
-              padding: 0;
-            }
-          }
-        }
-      }
-    }
-  }
-
-  .btnBox {
-    padding: 30px;
-    box-sizing: border-box;
-    display: flex;
-    align-items: center;
-    justify-content: space-evenly;
-
-    .save,
-    .close {
-      width: 100px;
-    }
-
-  }
-}
-
-.avatar-uploader .el-upload {
-  border: 1px dashed #d9d9d9;
-  border-radius: 6px;
-  cursor: pointer;
-  position: relative;
-  overflow: hidden;
-}
-
-.avatar-uploader .el-upload:hover {
-  border-color: #409EFF;
-}
-
-.avatar-uploader-icon {
-  font-size: 28px;
-  color: #8c939d;
-  width: 178px;
-  height: 178px;
-  line-height: 178px;
-  text-align: center;
-}
-
-.avatar {
-  width: 178px;
-  height: 178px;
-  display: block;
-}
-</style>
diff --git a/src/components/mycomponent/dialog/evaluateDialog.vue b/src/components/mycomponent/dialog/evaluateDialog.vue
deleted file mode 100644
index ba3ad75..0000000
--- a/src/components/mycomponent/dialog/evaluateDialog.vue
+++ /dev/null
@@ -1,365 +0,0 @@
-<!--季度评价弹窗-->
-<template>
-  <el-dialog title="季度评价" width="975px" :visible.sync="isShowInfo" append-to-body @close="close">
-    <div class="evaluateDialog">
-      <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.evaluateQuarterly" clearable placeholder="请选择" style="width:200px">
-                <el-option v-for="item in quarterOptions" :key="item.value" :label="item.label" :value="item.value" />
-              </el-select>
-            </input-vue>
-          </div>
-          <div class="inputBox">
-            <input-vue
-              v-model="addInfo.quarterlyEvaluateIllustration"
-              title="季度评价说明"
-              class="inputWidth"
-              placeholder="请输入季度评价说明"
-              width="200px"
-            />
-          </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">
-            <red-star />
-            <input-vue title="季度评价结果" class="inputWidth">
-              <el-select v-model="addInfo.quarterlyEvaluateResult" clearable placeholder="请选择" style="width:200px">
-                <el-option v-for="item in resultOptions" :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.quarterlyEvaluateDate"
-                placeholder="请选择日期"
-                suffix-icon="el-icon-date"
-                style="width:200px"
-              />
-            </input-vue>
-          </div>
-        </div>
-      </div>
-      <div class="imgContent">
-        <div class="img-box">
-          <div class="img-item">
-            <div v-if="fileName" class="title-box">
-              <div class="img-title">
-                {{ fileName }}
-              </div>
-              <div class="img-btn">
-                <el-button type="text" class="btn">
-                  下载
-                </el-button>
-              </div>
-            </div>
-            <el-upload
-              class="avatar-uploader"
-              :headers="myHeaders"
-              action="http://111.198.10.15:21403/file/uploadFile"
-              :show-file-list="false"
-              :on-success="handleAvatarSuccess"
-              :before-upload="beforeAvatarUpload"
-            >
-              <img v-if="imageUrl" :src="imageUrl" class="avatar">
-              <i v-else class="el-icon-plus avatar-uploader-icon" />
-            </el-upload>
-          </div>
-          <div class="img-item">
-            <div v-if="fileName2" class="title-box">
-              <div class="img-title">
-                {{ fileName2 }}
-              </div>
-              <div class="img-btn">
-                <el-button type="text" class="btn">
-                  下载
-                </el-button>
-              </div>
-            </div>
-            <el-upload
-              class="avatar-uploader"
-              :headers="myHeaders"
-              action="http://111.198.10.15:21403/file/uploadFile"
-              :show-file-list="false"
-              :on-success="handleAvatarSuccess2"
-              :before-upload="beforeAvatarUpload"
-            >
-              <img v-if="imageUrl2" :src="imageUrl2" class="avatar">
-              <i v-else class="el-icon-plus avatar-uploader-icon" />
-            </el-upload>
-          </div>
-        </div>
-        <div class="uploadbtn">
-          <el-button type="primary">
-            上传录库评审结果
-          </el-button>
-        </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 { getToken } from '@/utils/auth'
-import { Message } from 'element-ui'
-import { evaluateAdd } from '../../../api/supplier/supplier'
-
-export default {
-  components: { inputVue, dialogHeader, RedStar },
-  props: {
-    dataInfo: {
-      type: Object,
-      dataInfo: {}
-    }
-  },
-  data() {
-    return {
-      isShowInfo: true,
-      fileName: '',
-      imageUrl: '',
-      imageUrl2: '',
-      fileName2: '',
-      myHeaders: { token: getToken() },
-      quarterOptions: [
-        { label: '2021第一季度', value: '2021第一季度' },
-        { label: '2021第二季度', value: '2021第二季度' }
-      ],
-      resultOptions: [
-        { label: 'A', value: 'A' },
-        { label: 'B', value: 'B' },
-        { label: 'C', value: 'C' }
-      ],
-      addInfo: {
-        supplierCode: '',
-        supplierName: '',
-        evaluateQuarterly: '',
-        quarterlyEvaluateResult: '',
-        quarterlyEvaluateIllustration: '',
-        quarterlyEvaluateDate: '',
-        quarterlyEvaluateFile: ''
-      }
-    }
-  },
-  watch: {
-    dataInfo: {
-      handler(val) {
-        console.log(val)
-        if (val != '') {
-          const temp = { ...this.addInfo }
-          this.addInfo = {
-            supplierCode: val.supplierCode,
-            supplierName: val.supplierName,
-            evaluateQuarterly: temp.evaluateQuarterly,
-            quarterlyEvaluateResult: temp.quarterlyEvaluateResult,
-            quarterlyEvaluateIllustration: temp.quarterlyEvaluateIllustration,
-            quarterlyEvaluateDate: temp.quarterlyEvaluateDate,
-            quarterlyEvaluateFile: temp.quarterlyEvaluateFile
-          }
-          console.log(this.addInfo)
-        }
-      },
-      deep: true,
-      immediate: true
-    }
-  },
-  methods: {
-    close() {
-      this.$emit('close')
-    },
-    // 照片上传
-    handleAvatarSuccess(res, file) {
-      this.fileName = res.data.fileName
-      console.log(res, file)
-      this.imageUrl = URL.createObjectURL(file.raw)
-      console.log(this.addInfo.quarterlyEvaluateFile, 'this.addInfo.quarterlyEvaluateFile')
-      if (this.addInfo.quarterlyEvaluateFile == '') {
-        console.log('1')
-        this.addInfo.quarterlyEvaluateFile = res.data.fileId
-      } else {
-        console.log('2')
-        this.addInfo.quarterlyEvaluateFile = this.addInfo.quarterlyEvaluateFile + ',' + res.data.fileId
-      }
-      console.log(this.addInfo.quarterlyEvaluateFile)
-    },
-    handleAvatarSuccess2(res, file) {
-      this.fileName2 = res.data.fileName
-      console.log(res, file)
-      this.imageUrl2 = URL.createObjectURL(file.raw)
-      if (this.addInfo.quarterlyEvaluateFile == '') {
-        console.log('3')
-        this.addInfo.quarterlyEvaluateFile = res.data.fileId
-      } else {
-        console.log('4')
-        this.addInfo.quarterlyEvaluateFile = this.addInfo.quarterlyEvaluateFile + ',' + res.data.fileId
-      }
-      console.log(this.addInfo.quarterlyEvaluateFile)
-    },
-    beforeAvatarUpload(file) {
-      const isJPG = file.type === 'image/jpeg'
-      const isLt2M = file.size / 1024 / 1024 < 2
-
-      if (!isJPG) {
-        this.$message.error('上传头像图片只能是 JPG 格式!')
-      }
-      if (!isLt2M) {
-        this.$message.error('上传头像图片大小不能超过 2MB!')
-      }
-      return isJPG && isLt2M
-    },
-    save() {
-      evaluateAdd(this.addInfo).then(res => {
-        console.log(res)
-        if (!res.code) {
-          this.close()
-          Message.success('保存成功')
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style lang='scss' scoped>
-.evaluateDialog {
-  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: 600px;
-      height: 250px;
-      display: flex;
-      justify-content: space-between;
-      padding: 10px 40px;
-      border: 1px solid #000;
-
-      .img-item {
-        width: 178px;
-        height: 200px;
-
-        .title-box {
-          display: flex;
-          justify-content: space-between;
-
-          .img-title {
-            width: 150px;
-            white-space: nowrap;
-            overflow: hidden;
-            text-overflow: ellipsis;
-            margin-right: 20px;
-          }
-
-          .img-btn {
-            .btn {
-              padding: 0;
-            }
-          }
-        }
-      }
-    }
-  }
-
-  .btnBox {
-    padding: 30px;
-    box-sizing: border-box;
-    display: flex;
-    align-items: center;
-    justify-content: space-evenly;
-
-    .save,
-    .close {
-      width: 100px;
-    }
-
-  }
-}
-
-.avatar-uploader .el-upload {
-  border: 1px dashed #d9d9d9;
-  border-radius: 6px;
-  cursor: pointer;
-  position: relative;
-  overflow: hidden;
-}
-
-.avatar-uploader .el-upload:hover {
-  border-color: #409EFF;
-}
-
-.avatar-uploader-icon {
-  font-size: 28px;
-  color: #8c939d;
-  width: 178px;
-  height: 178px;
-  line-height: 178px;
-  text-align: center;
-}
-
-.avatar {
-  width: 178px;
-  height: 178px;
-  display: block;
-}
-</style>
diff --git a/src/components/mycomponent/dialog/historyAssessDialog.vue b/src/components/mycomponent/dialog/historyAssessDialog.vue
deleted file mode 100644
index 30a0c57..0000000
--- a/src/components/mycomponent/dialog/historyAssessDialog.vue
+++ /dev/null
@@ -1,146 +0,0 @@
-<!--历史考核弹窗-->
-<template>
-  <div class="historyAssessDialog dialog">
-    <dialog-header title="历史考核" @close="close" />
-    <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="assessAnnualName" label="考核年度" width="150" />
-        <el-table-column prop="annualAssessResultName" label="年度考核结果" width="150" />
-        <el-table-column prop="annualAssessIllustration" label="年度考核说明" width="150" />
-        <el-table-column prop="annualAssessDate" label="年度考核时间" width="150" />
-        <el-table-column prop="annualAssessFile" 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>
-</template>
-
-<script>
-import dialogHeader from './dialogHeader.vue'
-import inputVue from '../input/inputVue.vue'
-import RedStar from '../redStar.vue'
-
-import { historyAssess } from '../../../api/supplier/supplier'
-
-export default {
-  components: { inputVue, dialogHeader, RedStar },
-  props: {
-    dataInfo: {
-      type: Object,
-      dataInfo: {}
-    }
-  },
-  data() {
-    return {
-      tableData: []
-    }
-  },
-  mounted() {
-    this.getHistoryAssess()
-  },
-  methods: {
-    // 生成序号
-    indexMethod(index) {
-      return index + 1
-    },
-    // 合并表头
-    headerStyle({ row, column, rowIndex, columnIndex }) {
-      row[5].colSpan = 2 // 第三列的表头占据2个单元格
-      row[6].colSpan = 0
-      if (columnIndex === 6) {
-        return 'display: none'
-      }
-    },
-    close() {
-      this.$emit('close')
-    },
-    getHistoryAssess() {
-      historyAssess().then(res => {
-        console.log(res)
-        this.tableData = res
-      })
-    }
-  }
-}
-</script>
-
-<style lang='scss' scoped>
-.historyAssessDialog {
-  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 {
-    margin: 20px;
-  }
-
-}
-</style>
diff --git a/src/components/mycomponent/dialog/historyEvaluateDialog.vue b/src/components/mycomponent/dialog/historyEvaluateDialog.vue
deleted file mode 100644
index 8fce92f..0000000
--- a/src/components/mycomponent/dialog/historyEvaluateDialog.vue
+++ /dev/null
@@ -1,148 +0,0 @@
-<!--历史评价弹窗-->
-<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>
-</template>
-
-<script>
-import dialogHeader from './dialogHeader.vue'
-import inputVue from '../input/inputVue.vue'
-import RedStar from '../redStar.vue'
-
-import { historyEvaluate } from '../../../api/supplier/supplier'
-
-export default {
-  components: { inputVue, dialogHeader, RedStar },
-  props: {
-    dataInfo: {
-      type: Object,
-      dataInfo: {}
-    }
-  },
-  data() {
-    return {
-      isShowInfo: true,
-      tableData: []
-    }
-  },
-  mounted() {
-    this.getHistoryEvaluate()
-  },
-  methods: {
-    // 生成序号
-    indexMethod(index) {
-      return index + 1
-    },
-    // 合并表头
-    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)
-        this.tableData = res
-      })
-    }
-  }
-}
-</script>
-
-<style lang='scss' scoped>
-.historyEvaluateDialog {
-  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 {
-        display: flex;
-        justify-content: inherit;
-        align-items: center;
-      }
-    }
-
-  }
-
-  .Dialog-table {
-    margin: 20px;
-  }
-
-}
-</style>
diff --git a/src/views/supplier/assess.vue b/src/views/supplier/assess.vue
index 5315ce9..aa1b324 100644
--- a/src/views/supplier/assess.vue
+++ b/src/views/supplier/assess.vue
@@ -86,8 +86,8 @@
 
 <script>
 import GroupPage from '../../components/mycomponent/groupPage.vue'
-import assessDialog from '../../components/mycomponent/dialog/assessDialog.vue'
-import historyAssessDialog from '../../components/mycomponent/dialog/historyAssessDialog.vue'
+import assessDialog from './assessDialog.vue'
+import historyAssessDialog from './historyAssessDialog.vue'
 
 import { a_list } from '../../api/supplier/supplier'
 import { tableRowClassName } from '../../utils/myUtils/changeTableTr'
diff --git a/src/views/supplier/assessDialog.vue b/src/views/supplier/assessDialog.vue
new file mode 100644
index 0000000..fd4bc00
--- /dev/null
+++ b/src/views/supplier/assessDialog.vue
@@ -0,0 +1,368 @@
+<!--年度考核弹窗-->
+<template>
+  <el-dialog title="年度考核" width="975px" :visible.sync="isShowInfo" append-to-body @close="close">
+    <div class="assessDialog">
+      <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.assessAnnual" clearable placeholder="请选择" style="width:200px">
+                <el-option v-for="item in yearOptions" :key="item.value" :label="item.label" :value="item.value" />
+              </el-select>
+            </input-vue>
+          </div>
+          <div class="inputBox">
+            <input-vue
+              v-model="addInfo.annualAssessIllustration"
+              title="年度考核说明"
+              class="inputWidth"
+              placeholder="请输入年度考核说明"
+              width="200px"
+            />
+          </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">
+            <red-star />
+            <input-vue title="考核结果" class="inputWidth">
+              <el-select v-model="addInfo.annualAssessResult" clearable placeholder="请选择" style="width:200px">
+                <el-option v-for="item in resultOptions" :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.annualAssessDate"
+                placeholder="请选择日期"
+                suffix-icon="el-icon-date"
+                style="width:200px"
+              />
+            </input-vue>
+          </div>
+        </div>
+      </div>
+      <div class="imgContent">
+        <div class="img-box">
+          <div class="img-item">
+            <div v-if="fileName" class="title-box">
+              <div class="img-title">
+                {{ fileName }}
+              </div>
+              <div class="img-btn">
+                <el-button type="text" class="btn">
+                  下载
+                </el-button>
+              </div>
+            </div>
+            <el-upload
+              class="avatar-uploader"
+              :headers="myHeaders"
+              action="http://111.198.10.15:21403/file/uploadFile"
+              :show-file-list="false"
+              :on-success="handleAvatarSuccess"
+              :before-upload="beforeAvatarUpload"
+            >
+              <img v-if="imageUrl" :src="imageUrl" class="avatar">
+              <i v-else class="el-icon-plus avatar-uploader-icon" />
+            </el-upload>
+          </div>
+          <div class="img-item">
+            <div v-if="fileName2" class="title-box">
+              <div class="img-title">
+                {{ fileName2 }}
+              </div>
+              <div class="img-btn">
+                <el-button type="text" class="btn">
+                  下载
+                </el-button>
+              </div>
+            </div>
+            <el-upload
+              class="avatar-uploader"
+              :headers="myHeaders"
+              action="http://111.198.10.15:21403/file/uploadFile"
+              :show-file-list="false"
+              :on-success="handleAvatarSuccess2"
+              :before-upload="beforeAvatarUpload"
+            >
+              <img v-if="imageUrl2" :src="imageUrl2" class="avatar">
+              <i v-else class="el-icon-plus avatar-uploader-icon" />
+            </el-upload>
+          </div>
+        </div>
+        <div class="uploadbtn">
+          <el-button type="primary">
+            上传录库评审结果
+          </el-button>
+        </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 '../../components/mycomponent/dialog/dialogHeader.vue'
+import inputVue from '../../components/mycomponent/input/inputVue.vue'
+import RedStar from '../../components/mycomponent/redStar.vue'
+
+import { getToken } from '@/utils/auth'
+import { Message } from 'element-ui'
+import { assessAdd } from '../../api/supplier/supplier'
+export default {
+  name: 'AssessDialog',
+  components: { inputVue, dialogHeader, RedStar },
+  props: {
+    assessAnnualOpts: {
+      type: Array,
+      default() {
+        return []
+      },
+      required: true
+    }
+  },
+  data() {
+    return {
+      fileName: '',
+      imageUrl: '',
+      imageUrl2: '',
+      fileName2: '',
+      myHeaders: { token: getToken() },
+      isShowInfo: true,
+      yearOptions: [
+        { label: '2021', value: '2021' },
+        { label: '2022', value: '2022' }
+      ],
+      resultOptions: [
+        { label: 'A', value: 'A' },
+        { label: 'B', value: 'B' },
+        { label: 'C', value: 'C' }
+      ],
+      addInfo: {
+        supplierCode: '',
+        supplierName: '',
+        assessAnnual: '',
+        annualAssessResult: '',
+        annualAssessIllustration: '',
+        annualAssessDate: '',
+        annualAssessFile: ''
+      }
+    }
+  },
+  watch: {
+    dataInfo: {
+      handler(val) {
+        console.log(val)
+        if (val != '') {
+          const temp = { ...this.addInfo }
+          this.addInfo = {
+            supplierCode: val.supplierCode,
+            supplierName: val.supplierName,
+            assessAnnual: temp.assessAnnual,
+            annualAssessResult: temp.annualAssessResult,
+            annualAssessIllustration: temp.annualAssessIllustration,
+            annualAssessDate: temp.annualAssessDate,
+            annualAssessFile: temp.annualAssessFile
+          }
+          console.log(this.addInfo)
+        }
+      },
+      deep: true,
+      immediate: true
+    }
+  },
+  methods: {
+    close() {
+      this.$emit('close')
+    },
+    // 照片上传
+    handleAvatarSuccess(res, file) {
+      this.fileName = res.data.fileName
+      console.log(res, file)
+      this.imageUrl = URL.createObjectURL(file.raw)
+      console.log(this.addInfo.annualAssessFile, 'this.addInfo.annualAssessFile')
+      if (this.addInfo.annualAssessFile == '') {
+        console.log('1')
+        this.addInfo.annualAssessFile = res.data.fileId
+      } else {
+        console.log('2')
+        this.addInfo.annualAssessFile = this.addInfo.annualAssessFile + ',' + res.data.fileId
+      }
+      console.log(this.addInfo.annualAssessFile)
+    },
+    handleAvatarSuccess2(res, file) {
+      this.fileName2 = res.data.fileName
+      console.log(res, file)
+      this.imageUrl2 = URL.createObjectURL(file.raw)
+      if (this.addInfo.annualAssessFile == '') {
+        console.log('3')
+        this.addInfo.annualAssessFile = res.data.fileId
+      } else {
+        console.log('4')
+        this.addInfo.annualAssessFile = this.addInfo.annualAssessFile + ',' + res.data.fileId
+      }
+      console.log(this.addInfo.annualAssessFile)
+    },
+    beforeAvatarUpload(file) {
+      const isJPG = file.type === 'image/jpeg'
+      const isLt2M = file.size / 1024 / 1024 < 2
+
+      if (!isJPG) {
+        this.$message.error('上传头像图片只能是 JPG 格式!')
+      }
+      if (!isLt2M) {
+        this.$message.error('上传头像图片大小不能超过 2MB!')
+      }
+      return isJPG && isLt2M
+    },
+    save() {
+      assessAdd(this.addInfo).then(res => {
+        console.log(res)
+        if (!res.code) {
+          this.close()
+          Message.success('保存成功')
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style lang='scss' scoped>
+.assessDialog {
+  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: 600px;
+      height: 250px;
+      display: flex;
+      justify-content: space-between;
+      padding: 10px 40px;
+      border: 1px solid #000;
+
+      .img-item {
+        width: 178px;
+        height: 200px;
+
+        .title-box {
+          display: flex;
+          justify-content: space-between;
+
+          .img-title {
+            width: 150px;
+            white-space: nowrap;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            margin-right: 20px;
+          }
+
+          .img-btn {
+            .btn {
+              padding: 0;
+            }
+          }
+        }
+      }
+    }
+  }
+
+  .btnBox {
+    padding: 30px;
+    box-sizing: border-box;
+    display: flex;
+    align-items: center;
+    justify-content: space-evenly;
+
+    .save,
+    .close {
+      width: 100px;
+    }
+
+  }
+}
+
+.avatar-uploader .el-upload {
+  border: 1px dashed #d9d9d9;
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+}
+
+.avatar-uploader .el-upload:hover {
+  border-color: #409EFF;
+}
+
+.avatar-uploader-icon {
+  font-size: 28px;
+  color: #8c939d;
+  width: 178px;
+  height: 178px;
+  line-height: 178px;
+  text-align: center;
+}
+
+.avatar {
+  width: 178px;
+  height: 178px;
+  display: block;
+}
+</style>
diff --git a/src/views/supplier/evaluate.vue b/src/views/supplier/evaluate.vue
index f3ee896..7653a58 100644
--- a/src/views/supplier/evaluate.vue
+++ b/src/views/supplier/evaluate.vue
@@ -3,33 +3,26 @@
   <div class="evaluate">
     <div class="evaluate-inputs">
       供应商编号
-      <el-input
-        v-model="selectInfo.supplierCode"
-        style="width: 200px"
-        placeholder="请输入编号"
-        clearable
-        class="evaluate-input"
-      />
+      <el-input v-model="selectInfo.supplierCode" style="width: 200px" placeholder="请输入编号" clearable class="evaluate-input"/>
 
       供应商名称
-      <el-input
-        v-model="selectInfo.supplierName"
-        style="width: 200px"
-        placeholder="请输入供应商名称"
-        clearable
-        class="evaluate-input"
-      />
+      <el-input v-model="selectInfo.supplierName" style="width: 200px" placeholder="请输入供应商名称" clearable class="evaluate-input"/>
 
-      评价时间
-      <el-select
-        v-model="selectInfo.evaluateQuarterly"
-        class="evaluate-select"
-        filterable
-        placeholder="请选择结果"
-        style="width: 200px"
-      >
-        <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
+      年份
+      <el-select v-model="selectInfo.evaluateYear" class="evaluate-select" clearable placeholder="请选择年份" style="width: 150px">
+        <el-option v-for="item in evaluateAnnualOpts" :key="item.id" :label="item.name" :value="item.value" />
       </el-select>
+
+      季度
+      <el-select v-model="selectInfo.evaluateQuarterly" class="evaluate-select" clearable placeholder="请选择季度" style="width: 150px">
+        <el-option v-for="item in evaluateQuarterlyOpts" :key="item.id" :label="item.name" :value="item.value" />
+      </el-select>
+
+      评价结果
+      <el-select v-model="selectInfo.quarterlyEvaluateResult" class="evaluate-select" clearable placeholder="请选择评价结果" style="width: 150px">
+        <el-option v-for="item in evaluateResultOpts" :key="item.id" :label="item.name" :value="item.value" />
+      </el-select>
+
       <div class="evaluate-btns">
         <el-button type="primary" class="evaluate-button" @click="selectData">
           查询
@@ -51,14 +44,18 @@
         :row-style="{ 'text-align': 'center' }"
         style="width: 100%"
       >
-        <el-table-column type="index" label="序号" width="180" />
-        <el-table-column prop="supplierCode" label="供应商编号" width="180" />
-        <el-table-column prop="supplierName" label="供应商名称" />
-        <el-table-column prop="supplierStatusName" label="供应商状态" />
-        <el-table-column prop="evaluateQuarterlyName" label="最新季度评价" />
-        <el-table-column prop="quarterlyEvaluateResult" label="季度评价结果" />
-        <el-table-column prop="quarterlyEvaluateDate" label="季度评价日期" />
-        <el-table-column header-align="center" align="center" fixed="right" label="操作">
+        <el-table-column type="index" label="序号" width="100" />
+        <el-table-column prop="supplierCode" label="供应商编号" width="200" />
+        <el-table-column prop="supplierName" label="供应商名称" width="400" />
+        <el-table-column prop="supplierStatusName" label="供应商状态" width="100" />
+        <el-table-column label="最新评价季度">
+          <template v-if="scope.row.evaluateYearName !== ''" slot-scope="scope">
+            {{ scope.row.evaluateYearName }}年{{ scope.row.evaluateQuarterlyName }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="quarterlyEvaluateResultName" label="季度评价结果" width="150" />
+        <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)">
               历史评价
@@ -80,21 +77,29 @@
       />
     </div>
     <historyEvaluateDialog v-if="isShowHistoryDialog" :data-info="dataInfo" @close="evaluateHistoryDialogClose" />
-    <evaluateDialog v-if="isShowDialog" :data-info="dataInfo" @close="evaluateDialogClose" />
+    <evaluate-dialog
+      ref="evaluateDialog"
+                     @refreshList="selectData"
+                     :evaluate-annual-opts="evaluateAnnualOpts"
+                     :evaluate-quarterly-opts="evaluateQuarterlyOpts"
+                     :evaluate-result-opts="evaluateResultOpts"
+    />
   </div>
 </template>
 
 <script>
 import GroupPage from '../../components/mycomponent/groupPage.vue'
-import evaluateDialog from '../../components/mycomponent/dialog/evaluateDialog.vue'
-import historyEvaluateDialog from '../../components/mycomponent/dialog/historyEvaluateDialog.vue'
+import EvaluateDialog from '@/views/supplier/evaluateDialog'
+import historyEvaluateDialog from './historyEvaluateDialog.vue'
 
 import { e_list } from '../../api/supplier/supplier'
 import { tableRowClassName } from '../../utils/myUtils/changeTableTr'
 import { listMixin } from '../../utils/myUtils/mixins/listPage'
+import { getDictByCode } from '@/api/system/dict'
+
 export default { // 加入分页逻辑
   components: {
-    historyEvaluateDialog, evaluateDialog, GroupPage
+    historyEvaluateDialog, EvaluateDialog, GroupPage
   },
   mixins: [listMixin],
   data() {
@@ -105,18 +110,43 @@
       selectInfo: {
         supplierCode: '',
         supplierName: '',
-        evaluateQuarterly: ''
+        evaluateYear: '',
+        evaluateQuarterly: '',
+        quarterlyEvaluateResult: ''
       },
-      options: [
-        { label: '2022第一季度', value: '2022第一季度' },
-        { label: '2021第二季度', value: '2021第二季度' }
-      ]
+      evaluateAnnualOpts: [],
+      evaluateQuarterlyOpts: [],
+      evaluateResultOpts: []
     }
   },
   mounted() {
+    this.getDictEvaluateAnnual()
+    this.getDictEvaluateQuarterly()
+    this.getDictEvaluateResult()
   },
   methods: {
     tableRowClassName: tableRowClassName,
+    getDictEvaluateAnnual() {
+      getDictByCode('assessAnnual').then(response => {
+        if (response.code === 200) {
+          this.evaluateAnnualOpts = response.data
+        }
+      })
+    },
+    getDictEvaluateQuarterly() {
+      getDictByCode('evaluateQuarterly').then(response => {
+        if (response.code === 200) {
+          this.evaluateQuarterlyOpts = response.data
+        }
+      })
+    },
+    getDictEvaluateResult() {
+      getDictByCode('evaluateResult').then(response => {
+        if (response.code === 200) {
+          this.evaluateResultOpts = response.data
+        }
+      })
+    },
     hitstoryDialog(row) {
       this.dataInfo = row
       this.isShowHistoryDialog = true
@@ -128,10 +158,9 @@
       this.isShowDialog = false
     },
     evaluateDialogClick(row) {
-      this.dataInfo = row
-      this.isShowDialog = true
+      this.$refs.evaluateDialog.initDialog(row)
     },
-    getListPage(limit, offset) {
+    getListPage(limit = 10, offset = 1) {
       e_list(`limit=${limit}&offset=${offset}`, this.queryInfo).then(res => {
         console.log(res)
         this.tableData = res
@@ -141,7 +170,9 @@
       this.selectInfo = { // 搜索框中的数据的数据
         supplierCode: '',
         supplierName: '',
-        evaluateQuarterly: ''
+        evaluateYear: '',
+        evaluateQuarterly: '',
+        quarterlyEvaluateResult: ''
       }
     }
   }
@@ -166,7 +197,7 @@
   }
 
   .evaluate-select {
-    margin: 0 4rem 0 0.5rem;
+    margin: 0 1rem 0 0.5rem;
   }
 
   .evaluate-btns {
diff --git a/src/views/supplier/evaluateDialog.vue b/src/views/supplier/evaluateDialog.vue
new file mode 100644
index 0000000..b217191
--- /dev/null
+++ b/src/views/supplier/evaluateDialog.vue
@@ -0,0 +1,309 @@
+<!--季度评价弹窗-->
+<template>
+  <el-dialog title="季度评价" width="975px" :visible.sync="isShowInfo" append-to-body @close="close">
+    <el-form ref="evaluateForm" :model="addInfo" :rules="evaluateRules" 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="evaluateYear">
+            <el-select v-model="addInfo.evaluateYear" clearable placeholder="请选择年份" style="width: 100%">
+              <el-option v-for="item in evaluateAnnualOpts" :key="item.id" :label="item.name" :value="item.value" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="10">
+          <el-form-item label="季度" prop="evaluateQuarterly">
+            <el-select v-model="addInfo.evaluateQuarterly" clearable placeholder="请选择季度" style="width: 100%">
+              <el-option v-for="item in evaluateQuarterlyOpts" :key="item.id" :label="item.name" :value="item.value" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="10">
+          <el-form-item label="评审结果" prop="quarterlyEvaluateResult">
+            <el-select v-model="addInfo.quarterlyEvaluateResult" clearable placeholder="请选择评价结果" style="width: 100%">
+              <el-option v-for="item in evaluateResultOpts" :key="item.id" :label="item.name" :value="item.value" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="10">
+          <el-form-item label="评审日期" prop="quarterlyEvaluateDate">
+            <el-date-picker v-model="addInfo.quarterlyEvaluateDate" 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="评审结果说明">
+            <el-input v-model="addInfo.quarterlyEvaluateIllustration" 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="evaluateFile"
+              action="action"
+              :file-list="quarterlyEvaluateFileList"
+              :http-request="uploadQuarterlyEvaluateFile"
+              :before-upload="handleBeforeUpload"
+              :on-remove="handleQuarterlyEvaluateFileRemove"
+              :on-exceed="quarterlyEvaluateFileExceed"
+              :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="evaluateDialog">
+      <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 { evaluateAdd } from '@/api/supplier/supplier'
+import { Uploadimg } from '@/api/common'
+import { getToday } from '@/utils/dateutils'
+
+export default {
+  name: 'EvaluateDialog',
+  props: {
+    evaluateAnnualOpts: {
+      type: Array,
+      default() {
+        return []
+      },
+      required: true
+    },
+    evaluateQuarterlyOpts: {
+      type: Array,
+      default() {
+        return []
+      },
+      required: true
+    },
+    evaluateResultOpts: {
+      type: Array,
+      default() {
+        return []
+      },
+      required: true
+    }
+  },
+  data() {
+    return {
+      isShowInfo: false,
+      quarterOptions: [
+        { label: '2021第一季度', value: '2021第一季度' },
+        { label: '2021第二季度', value: '2021第二季度' }
+      ],
+      resultOptions: [
+        { label: 'A', value: 'A' },
+        { label: 'B', value: 'B' },
+        { label: 'C', value: 'C' }
+      ],
+      addInfo: {
+        supplierCode: '',
+        supplierName: '',
+        evaluateYear: '',
+        evaluateQuarterly: '',
+        quarterlyEvaluateResult: '',
+        quarterlyEvaluateIllustration: '',
+        quarterlyEvaluateDate: '',
+        quarterlyEvaluateFile: ''
+      },
+      evaluateRules: {
+        evaluateYear: [{ required: true, message: '请选择评价年份', trigger: 'change' }],
+        evaluateQuarterly: [{ required: true, message: '请选择评价季度', trigger: 'change' }],
+        quarterlyEvaluateResult: [{ required: true, message: '请选择评价结果', trigger: 'change' }],
+        quarterlyEvaluateDate: [{ required: true, message: '请选择评价日期', trigger: 'blur' }]
+      },
+      quarterlyEvaluateFileList: [],
+      evaluateValid: 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.quarterlyEvaluateDate = getToday('yyyy-MM-dd')
+      }
+    },
+    save() {
+      this.validateForm()
+      if (this.evaluateValid === true) {
+        if (this.quarterlyEvaluateFileList.length > 0) {
+          for (const i in this.quarterlyEvaluateFileList) {
+            this.addInfo.quarterlyEvaluateFile += this.quarterlyEvaluateFileList[i].url + ','
+          }
+
+          this.addInfo.quarterlyEvaluateFile = this.addInfo.quarterlyEvaluateFile.substring(0, this.addInfo.quarterlyEvaluateFile.length - 1)
+        }
+
+        evaluateAdd(this.addInfo).then(res => {
+          if (!res.code) {
+            this.$message.success('保存成功')
+            this.clearForm()
+            this.close()
+          }
+        })
+      }
+    },
+    validateForm: function() {
+      this.$refs.evaluateForm.validate(valid => {
+        this.evaluateValid = valid
+      })
+    },
+    clearForm() {
+      this.addInfo = {
+        supplierCode: '',
+        supplierName: '',
+        evaluateYear: '',
+        evaluateQuarterly: '',
+        quarterlyEvaluateResult: '',
+        quarterlyEvaluateIllustration: '',
+        quarterlyEvaluateDate: '',
+        quarterlyEvaluateFile: ''
+      }
+      this.quarterlyEvaluateFileList = []
+      // 清除验证
+      this.$nextTick(() => {
+        this.$refs.evaluateForm.clearValidate()
+      })
+    },
+    uploadQuarterlyEvaluateFile(file) {
+      // 判断文件是否已经上传过
+      for (const i in this.quarterlyEvaluateFileList) {
+        if (this.quarterlyEvaluateFileList[i].name === file.name) {
+          this.$message.error('该文件已上传过，请选择其他文件')
+          this.handleFileNotUploaded(file, this.$refs.evaluateFile.uploadFiles)
+          return
+        }
+      }
+
+      Uploadimg(file).then(res => {
+        if (res.code === 200) {
+          this.quarterlyEvaluateFileList.push({
+            name: res.data.fileName,
+            url: res.data.fileId,
+            type: file.file.type
+          })
+          this.$message.success('文件上传成功')
+        }
+      })
+    },
+    handleQuarterlyEvaluateFileRemove(file) {
+      this.handleRemove(file, this.quarterlyEvaluateFileList)
+    },
+    quarterlyEvaluateFileExceed(file, fileList) {
+      this.handleExceed(file, this.quarterlyEvaluateFileList)
+    },
+    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>
+.evaluateDialog {
+  width: 975px;
+  padding: 0 20px;
+  box-sizing: border-box;
+
+  .btnBox {
+    padding: 30px;
+    box-sizing: border-box;
+    display: flex;
+    align-items: center;
+    justify-content: space-evenly;
+
+    .save,
+    .close {
+      width: 200px;
+    }
+
+  }
+}
+</style>
diff --git a/src/views/supplier/historyAssessDialog.vue b/src/views/supplier/historyAssessDialog.vue
new file mode 100644
index 0000000..83694dd
--- /dev/null
+++ b/src/views/supplier/historyAssessDialog.vue
@@ -0,0 +1,146 @@
+<!--历史考核弹窗-->
+<template>
+  <div class="historyAssessDialog dialog">
+    <dialog-header title="历史考核" @close="close" />
+    <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="assessAnnualName" label="考核年度" width="150" />
+        <el-table-column prop="annualAssessResultName" label="年度考核结果" width="150" />
+        <el-table-column prop="annualAssessIllustration" label="年度考核说明" width="150" />
+        <el-table-column prop="annualAssessDate" label="年度考核时间" width="150" />
+        <el-table-column prop="annualAssessFile" 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>
+</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 { historyAssess } from '../../api/supplier/supplier'
+
+export default {
+  components: { inputVue, dialogHeader, RedStar },
+  props: {
+    dataInfo: {
+      type: Object,
+      dataInfo: {}
+    }
+  },
+  data() {
+    return {
+      tableData: []
+    }
+  },
+  mounted() {
+    this.getHistoryAssess()
+  },
+  methods: {
+    // 生成序号
+    indexMethod(index) {
+      return index + 1
+    },
+    // 合并表头
+    headerStyle({ row, column, rowIndex, columnIndex }) {
+      row[5].colSpan = 2 // 第三列的表头占据2个单元格
+      row[6].colSpan = 0
+      if (columnIndex === 6) {
+        return 'display: none'
+      }
+    },
+    close() {
+      this.$emit('close')
+    },
+    getHistoryAssess() {
+      historyAssess().then(res => {
+        console.log(res)
+        this.tableData = res
+      })
+    }
+  }
+}
+</script>
+
+<style lang='scss' scoped>
+.historyAssessDialog {
+  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 {
+    margin: 20px;
+  }
+
+}
+</style>
diff --git a/src/views/supplier/historyEvaluateDialog.vue b/src/views/supplier/historyEvaluateDialog.vue
new file mode 100644
index 0000000..092fc37
--- /dev/null
+++ b/src/views/supplier/historyEvaluateDialog.vue
@@ -0,0 +1,148 @@
+<!--历史评价弹窗-->
+<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>
+</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'
+
+export default {
+  components: { inputVue, dialogHeader, RedStar },
+  props: {
+    dataInfo: {
+      type: Object,
+      dataInfo: {}
+    }
+  },
+  data() {
+    return {
+      isShowInfo: true,
+      tableData: []
+    }
+  },
+  mounted() {
+    this.getHistoryEvaluate()
+  },
+  methods: {
+    // 生成序号
+    indexMethod(index) {
+      return index + 1
+    },
+    // 合并表头
+    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)
+        this.tableData = res
+      })
+    }
+  }
+}
+</script>
+
+<style lang='scss' scoped>
+.historyEvaluateDialog {
+  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 {
+        display: flex;
+        justify-content: inherit;
+        align-items: center;
+      }
+    }
+
+  }
+
+  .Dialog-table {
+    margin: 20px;
+  }
+
+}
+</style>
diff --git a/src/views/supplier/inquiryDialog.vue b/src/views/supplier/inquiryDialog.vue
index 35f16c5..ff65c25 100644
--- a/src/views/supplier/inquiryDialog.vue
+++ b/src/views/supplier/inquiryDialog.vue
@@ -52,7 +52,7 @@
               :file-list="preReviewFileList"
               :http-request="uploadPreReviewFile"
               :before-upload="handleBeforeUpload"
-              :on-remove="handlePreReviewFileFileRemove"
+              :on-remove="handlePreReviewFileRemove"
               :on-exceed="preReviewFileExceed"
               :on-preview="handlePreview"
               :limit="5"
@@ -199,7 +199,7 @@
         }
       })
     },
-    handlePreReviewFileFileRemove(file) {
+    handlePreReviewFileRemove(file) {
       this.handleRemove(file, this.preReviewFileList)
     },
     preReviewFileExceed(file, fileList) {
diff --git a/src/views/supplier/reviewDialog.vue b/src/views/supplier/reviewDialog.vue
index 13432a1..4cb5c83 100644
--- a/src/views/supplier/reviewDialog.vue
+++ b/src/views/supplier/reviewDialog.vue
@@ -52,7 +52,7 @@
               :file-list="inputReviewFileList"
               :http-request="uploadInputReviewFile"
               :before-upload="handleBeforeUpload"
-              :on-remove="handleInputReviewFileFileRemove"
+              :on-remove="handleInputReviewFileRemove"
               :on-exceed="inputReviewFileExceed"
               :on-preview="handlePreview"
               :limit="5"
@@ -184,7 +184,7 @@
         }
       })
     },
-    handleInputReviewFileFileRemove(file) {
+    handleInputReviewFileRemove(file) {
       this.handleRemove(file, this.inputReviewFileList)
     },
     inputReviewFileExceed(file, fileList) {