diff --git a/src/views/supplier/assess.vue b/src/views/supplier/assess.vue
index aa1b324..de44528 100644
--- a/src/views/supplier/assess.vue
+++ b/src/views/supplier/assess.vue
@@ -3,33 +3,21 @@
   <div class="assess">
     <div class="assess-inputs">
       供应商编号
-      <el-input
-        v-model="selectInfo.supplierCode"
-        style="width: 200px"
-        placeholder="请输入编号"
-        clearable
-        class="assess-input"
-      />
+      <el-input v-model="selectInfo.supplierCode" style="width: 200px" placeholder="请输入编号" clearable class="assess-input"/>
 
       供应商名称
-      <el-input
-        v-model="selectInfo.supplierName"
-        style="width: 200px"
-        placeholder="请输入供应商名称"
-        clearable
-        class="assess-input"
-      />
+      <el-input v-model="selectInfo.supplierName" style="width: 200px" placeholder="请输入供应商名称" clearable class="assess-input"/>
 
-      考核年度
-      <el-select
-        v-model="selectInfo.assessAnnual"
-        class="assess-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.assessAnnual" class="assess-select" clearable placeholder="请选择年份" style="width: 150px">
+        <el-option v-for="item in assessAnnualOpts" :key="item.id" :label="item.name" :value="item.value" />
       </el-select>
+
+      评价结果
+      <el-select v-model="selectInfo.annualAssessResult" class="assess-select" clearable placeholder="请选择考核结果" style="width: 150px">
+        <el-option v-for="item in assessResultOpts" :key="item.id" :label="item.name" :value="item.value" />
+      </el-select>
+
       <div class="assess-btns">
         <el-button type="primary" class="assess-button" @click="selectData">
           查询
@@ -51,16 +39,16 @@
         :row-style="{ 'text-align': 'center' }"
         style="width: 100%"
       >
-        <el-table-column type="index" label="序号" />
-        <el-table-column prop="supplierCode" label="供应商编号" width="180" />
+        <el-table-column type="index" label="序号" width="100" />
+        <el-table-column prop="supplierCode" label="供应商编号" width="200" />
         <el-table-column prop="supplierName" label="供应商名称" />
-        <el-table-column prop="supplierStatusName" label="供应商状态" />
-        <el-table-column prop="assessAnnualName" label="考核年度" />
-        <el-table-column prop="annualAssessResultName" label="考核结果" />
-        <el-table-column prop="annualAssessDate" label="考核日期" />
-        <el-table-column header-align="center" align="center" fixed="right" label="操作">
+        <el-table-column prop="supplierStatusName" label="供应商状态" width="100" />
+        <el-table-column prop="assessAnnualName" width="200" label="考核年度" />
+        <el-table-column prop="annualAssessResultName" width="200" label="考核结果" />
+        <el-table-column prop="annualAssessDate" width="200" label="考核日期" />
+        <el-table-column header-align="center" width="200" align="center" fixed="right" label="操作">
           <template slot-scope="scope">
-            <el-button type="text" size="small" @click="hitstoryDialog(scope.row)">
+            <el-button type="text" size="small" @click="historyDialog(scope.row)">
               历史考核
             </el-button>
             <el-button type="text" size="small" @click="assessDialogClick(scope.row)">
@@ -79,22 +67,28 @@
         @setLimit="setLimit"
       />
     </div>
-    <historyAssessDialog v-if="isShowHistoryDialog" :data-info="dataInfo" @close="assessHistoryDialogClose" />
-    <assessDialog v-if="isShowDialog" :data-info="dataInfo" @close="assessDialogClose" />
+    <history-assess-dialog ref="assessHis" />
+    <assess-dialog
+      ref="assessDialog"
+      @refreshList="selectData"
+      :assess-annual-opts="assessAnnualOpts"
+      :assess-result-opts="assessResultOpts"
+    />
   </div>
 </template>
 
 <script>
 import GroupPage from '../../components/mycomponent/groupPage.vue'
-import assessDialog from './assessDialog.vue'
-import historyAssessDialog from './historyAssessDialog.vue'
+import AssessDialog from '@/views/supplier/assessDialog'
+import HistoryAssessDialog from '@/views/supplier/historyAssessDialog'
 
 import { a_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: {
-    historyAssessDialog, assessDialog, GroupPage
+    HistoryAssessDialog, AssessDialog, GroupPage
   },
   mixins: [listMixin],
   data() {
@@ -105,36 +99,41 @@
       selectInfo: {
         supplierCode: '',
         supplierName: '',
-        assessAnnual: ''
+        assessAnnual: '',
+        annualAssessResult: ''
       },
-      options: [
-        { label: '2020', value: '2020' },
-        { label: '2021', value: '2021' },
-        { label: '2022', value: '2022' }
-      ]
+      assessAnnualOpts: [],
+      assessResultOpts: []
     }
   },
   mounted() {
+    this.getDictAssessAnnual()
+    this.getDictAssessResult()
   },
   methods: {
     tableRowClassName: tableRowClassName,
-    hitstoryDialog(row) {
-      this.dataInfo = row
-      this.isShowHistoryDialog = true
+    getDictAssessAnnual() {
+      getDictByCode('assessAnnual').then(response => {
+        if (response.code === 200) {
+          this.assessAnnualOpts = response.data
+        }
+      })
     },
-    assessHistoryDialogClose() {
-      this.isShowHistoryDialog = false
+    getDictAssessResult() {
+      getDictByCode('evaluateResult').then(response => {
+        if (response.code === 200) {
+          this.assessResultOpts = response.data
+        }
+      })
     },
-    assessDialogClose() {
-      this.isShowDialog = false
+    historyDialog(row) {
+      this.$refs.assessHis.initHistoryDialog(row)
     },
     assessDialogClick(row) {
-      this.dataInfo = row
-      this.isShowDialog = true
+      this.$refs.assessDialog.initDialog(row)
     },
-    getListPage(limit, offset) {
+    getListPage(limit = 10, offset = 1) {
       a_list(`limit=${limit}&offset=${offset}`, this.queryInfo).then(res => {
-        console.log(res)
         this.tableData = res
       })
     },
@@ -142,7 +141,8 @@
       this.selectInfo = { // 搜索框中的数据的数据
         supplierCode: '',
         supplierName: '',
-        assessAnnualName: ''
+        assessAnnual: '',
+        annualAssessResult: ''
       }
     }
   }
@@ -167,7 +167,7 @@
   }
 
   .assess-select {
-    margin: 0 4rem 0 0.5rem;
+    margin: 0 1rem 0 0.5rem;
   }
 
   .assess-btns {

diff --git a/src/views/supplier/assess.vue b/src/views/supplier/assess.vue
index aa1b324..de44528 100644
--- a/src/views/supplier/assess.vue
+++ b/src/views/supplier/assess.vue
@@ -3,33 +3,21 @@
   <div class="assess">
     <div class="assess-inputs">
       供应商编号
-      <el-input
-        v-model="selectInfo.supplierCode"
-        style="width: 200px"
-        placeholder="请输入编号"
-        clearable
-        class="assess-input"
-      />
+      <el-input v-model="selectInfo.supplierCode" style="width: 200px" placeholder="请输入编号" clearable class="assess-input"/>
 
       供应商名称
-      <el-input
-        v-model="selectInfo.supplierName"
-        style="width: 200px"
-        placeholder="请输入供应商名称"
-        clearable
-        class="assess-input"
-      />
+      <el-input v-model="selectInfo.supplierName" style="width: 200px" placeholder="请输入供应商名称" clearable class="assess-input"/>
 
-      考核年度
-      <el-select
-        v-model="selectInfo.assessAnnual"
-        class="assess-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.assessAnnual" class="assess-select" clearable placeholder="请选择年份" style="width: 150px">
+        <el-option v-for="item in assessAnnualOpts" :key="item.id" :label="item.name" :value="item.value" />
       </el-select>
+
+      评价结果
+      <el-select v-model="selectInfo.annualAssessResult" class="assess-select" clearable placeholder="请选择考核结果" style="width: 150px">
+        <el-option v-for="item in assessResultOpts" :key="item.id" :label="item.name" :value="item.value" />
+      </el-select>
+
       <div class="assess-btns">
         <el-button type="primary" class="assess-button" @click="selectData">
           查询
@@ -51,16 +39,16 @@
         :row-style="{ 'text-align': 'center' }"
         style="width: 100%"
       >
-        <el-table-column type="index" label="序号" />
-        <el-table-column prop="supplierCode" label="供应商编号" width="180" />
+        <el-table-column type="index" label="序号" width="100" />
+        <el-table-column prop="supplierCode" label="供应商编号" width="200" />
         <el-table-column prop="supplierName" label="供应商名称" />
-        <el-table-column prop="supplierStatusName" label="供应商状态" />
-        <el-table-column prop="assessAnnualName" label="考核年度" />
-        <el-table-column prop="annualAssessResultName" label="考核结果" />
-        <el-table-column prop="annualAssessDate" label="考核日期" />
-        <el-table-column header-align="center" align="center" fixed="right" label="操作">
+        <el-table-column prop="supplierStatusName" label="供应商状态" width="100" />
+        <el-table-column prop="assessAnnualName" width="200" label="考核年度" />
+        <el-table-column prop="annualAssessResultName" width="200" label="考核结果" />
+        <el-table-column prop="annualAssessDate" width="200" label="考核日期" />
+        <el-table-column header-align="center" width="200" align="center" fixed="right" label="操作">
           <template slot-scope="scope">
-            <el-button type="text" size="small" @click="hitstoryDialog(scope.row)">
+            <el-button type="text" size="small" @click="historyDialog(scope.row)">
               历史考核
             </el-button>
             <el-button type="text" size="small" @click="assessDialogClick(scope.row)">
@@ -79,22 +67,28 @@
         @setLimit="setLimit"
       />
     </div>
-    <historyAssessDialog v-if="isShowHistoryDialog" :data-info="dataInfo" @close="assessHistoryDialogClose" />
-    <assessDialog v-if="isShowDialog" :data-info="dataInfo" @close="assessDialogClose" />
+    <history-assess-dialog ref="assessHis" />
+    <assess-dialog
+      ref="assessDialog"
+      @refreshList="selectData"
+      :assess-annual-opts="assessAnnualOpts"
+      :assess-result-opts="assessResultOpts"
+    />
   </div>
 </template>
 
 <script>
 import GroupPage from '../../components/mycomponent/groupPage.vue'
-import assessDialog from './assessDialog.vue'
-import historyAssessDialog from './historyAssessDialog.vue'
+import AssessDialog from '@/views/supplier/assessDialog'
+import HistoryAssessDialog from '@/views/supplier/historyAssessDialog'
 
 import { a_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: {
-    historyAssessDialog, assessDialog, GroupPage
+    HistoryAssessDialog, AssessDialog, GroupPage
   },
   mixins: [listMixin],
   data() {
@@ -105,36 +99,41 @@
       selectInfo: {
         supplierCode: '',
         supplierName: '',
-        assessAnnual: ''
+        assessAnnual: '',
+        annualAssessResult: ''
       },
-      options: [
-        { label: '2020', value: '2020' },
-        { label: '2021', value: '2021' },
-        { label: '2022', value: '2022' }
-      ]
+      assessAnnualOpts: [],
+      assessResultOpts: []
     }
   },
   mounted() {
+    this.getDictAssessAnnual()
+    this.getDictAssessResult()
   },
   methods: {
     tableRowClassName: tableRowClassName,
-    hitstoryDialog(row) {
-      this.dataInfo = row
-      this.isShowHistoryDialog = true
+    getDictAssessAnnual() {
+      getDictByCode('assessAnnual').then(response => {
+        if (response.code === 200) {
+          this.assessAnnualOpts = response.data
+        }
+      })
     },
-    assessHistoryDialogClose() {
-      this.isShowHistoryDialog = false
+    getDictAssessResult() {
+      getDictByCode('evaluateResult').then(response => {
+        if (response.code === 200) {
+          this.assessResultOpts = response.data
+        }
+      })
     },
-    assessDialogClose() {
-      this.isShowDialog = false
+    historyDialog(row) {
+      this.$refs.assessHis.initHistoryDialog(row)
     },
     assessDialogClick(row) {
-      this.dataInfo = row
-      this.isShowDialog = true
+      this.$refs.assessDialog.initDialog(row)
     },
-    getListPage(limit, offset) {
+    getListPage(limit = 10, offset = 1) {
       a_list(`limit=${limit}&offset=${offset}`, this.queryInfo).then(res => {
-        console.log(res)
         this.tableData = res
       })
     },
@@ -142,7 +141,8 @@
       this.selectInfo = { // 搜索框中的数据的数据
         supplierCode: '',
         supplierName: '',
-        assessAnnualName: ''
+        assessAnnual: '',
+        annualAssessResult: ''
       }
     }
   }
@@ -167,7 +167,7 @@
   }
 
   .assess-select {
-    margin: 0 4rem 0 0.5rem;
+    margin: 0 1rem 0 0.5rem;
   }
 
   .assess-btns {
diff --git a/src/views/supplier/assessDialog.vue b/src/views/supplier/assessDialog.vue
index fd4bc00..99f9ec1 100644
--- a/src/views/supplier/assessDialog.vue
+++ b/src/views/supplier/assessDialog.vue
@@ -1,126 +1,74 @@
 <!--年度考核弹窗-->
 <template>
-  <el-dialog title="年度考核" width="975px" :visible.sync="isShowInfo" append-to-body @close="close">
+  <el-dialog title="年度考核" width="60%" :visible.sync="isShowInfo" append-to-body :close-on-click-modal="false">
+    <el-form ref="assessForm" :model="addInfo" :rules="assessRules" 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="assessAnnual">
+            <el-select v-model="addInfo.assessAnnual" clearable placeholder="请选择年份" style="width: 100%">
+              <el-option v-for="item in assessAnnualOpts" :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="annualAssessResult">
+            <el-select v-model="addInfo.annualAssessResult" clearable placeholder="请选择考核结果" style="width: 100%">
+              <el-option v-for="item in assessResultOpts" :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="annualAssessDate">
+            <el-date-picker v-model="addInfo.annualAssessDate" 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.annualAssessIllustration" 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="assessFile"
+              action="action"
+              :file-list="annualAssessFileList"
+              :http-request="uploadAnnualAssessFile"
+              :before-upload="handleBeforeUpload"
+              :on-remove="handleAnnualAssessFileRemove"
+              :on-exceed="annualAssessFileExceed"
+              :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="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">
           保存
@@ -134,16 +82,13 @@
 </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'
+import { assessAdd } from '@/api/supplier/supplier'
+import { Uploadimg } from '@/api/common'
+import { getToday } from '@/utils/dateutils'
+
 export default {
   name: 'AssessDialog',
-  components: { inputVue, dialogHeader, RedStar },
   props: {
     assessAnnualOpts: {
       type: Array,
@@ -151,25 +96,18 @@
         return []
       },
       required: true
+    },
+    assessResultOpts: {
+      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' }
-      ],
+      isShowInfo: false,
       addInfo: {
         supplierCode: '',
         supplierName: '',
@@ -178,83 +116,145 @@
         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
+      assessRules: {
+        assessAnnual: [{ required: true, message: '请选择考核年份', trigger: 'change' }],
+        annualAssessResult: [{ required: true, message: '请选择考核结果', trigger: 'change' }],
+        annualAssessDate: [{ required: true, message: '请选择考核日期', trigger: 'blur' }]
+      },
+      annualAssessFileList: [],
+      assessValid: false
     }
   },
   methods: {
     close() {
-      this.$emit('close')
+      this.isShowInfo = false
+      this.$emit('refreshList')
     },
-    // 照片上传
-    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
+    initDialog(row) {
+      this.isShowInfo = true
+      if (row !== null) {
+        this.addInfo.supplierCode = row.supplierCode
+        this.addInfo.supplierName = row.supplierName
+        this.addInfo.annualAssessDate = getToday('yyyy-MM-dd')
       }
-      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('保存成功')
+      this.validateForm()
+      if (this.assessValid === true) {
+        if (this.annualAssessFileList.length > 0) {
+          for (const i in this.annualAssessFileList) {
+            this.addInfo.annualAssessFile += this.annualAssessFileList[i].url + ','
+          }
+
+          this.addInfo.annualAssessFile = this.addInfo.annualAssessFile.substring(0, this.addInfo.annualAssessFile.length - 1)
+        }
+
+        assessAdd(this.addInfo).then(res => {
+          if (!res.code) {
+            this.$message.success('保存成功')
+            this.clearForm()
+            this.close()
+          }
+        })
+      }
+    },
+    validateForm: function() {
+      this.$refs.assessForm.validate(valid => {
+        this.assessValid = valid
+      })
+    },
+    clearForm() {
+      this.addInfo = {
+        supplierCode: '',
+        supplierName: '',
+        assessAnnual: '',
+        annualAssessResult: '',
+        annualAssessIllustration: '',
+        annualAssessDate: '',
+        annualAssessFile: ''
+      }
+      this.annualAssessFileList = []
+      // 清除验证
+      this.$nextTick(() => {
+        this.$refs.assessForm.clearValidate()
+      })
+    },
+    uploadAnnualAssessFile(file) {
+      // 判断文件是否已经上传过
+      for (const i in this.annualAssessFileList) {
+        if (this.annualAssessFileList[i].name === file.name) {
+          this.$message.error('该文件已上传过，请选择其他文件')
+          this.handleFileNotUploaded(file, this.$refs.assessFile.uploadFiles)
+          return
+        }
+      }
+
+      Uploadimg(file).then(res => {
+        if (res.code === 200) {
+          this.annualAssessFileList.push({
+            name: res.data.fileName,
+            url: res.data.fileId,
+            type: file.file.type
+          })
+          this.$message.success('文件上传成功')
         }
       })
+    },
+    handleAnnualAssessFileRemove(file) {
+      this.handleRemove(file, this.annualAssessFileList)
+    },
+    annualAssessFileExceed(file, fileList) {
+      this.handleExceed(file, this.annualAssessFileList)
+    },
+    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)
+        }
+      }
     }
   }
 }
@@ -266,64 +266,6 @@
   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;
@@ -333,36 +275,9 @@
 
     .save,
     .close {
-      width: 100px;
+      width: 200px;
     }
-
   }
 }
 
-.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/assess.vue b/src/views/supplier/assess.vue
index aa1b324..de44528 100644
--- a/src/views/supplier/assess.vue
+++ b/src/views/supplier/assess.vue
@@ -3,33 +3,21 @@
   <div class="assess">
     <div class="assess-inputs">
       供应商编号
-      <el-input
-        v-model="selectInfo.supplierCode"
-        style="width: 200px"
-        placeholder="请输入编号"
-        clearable
-        class="assess-input"
-      />
+      <el-input v-model="selectInfo.supplierCode" style="width: 200px" placeholder="请输入编号" clearable class="assess-input"/>
 
       供应商名称
-      <el-input
-        v-model="selectInfo.supplierName"
-        style="width: 200px"
-        placeholder="请输入供应商名称"
-        clearable
-        class="assess-input"
-      />
+      <el-input v-model="selectInfo.supplierName" style="width: 200px" placeholder="请输入供应商名称" clearable class="assess-input"/>
 
-      考核年度
-      <el-select
-        v-model="selectInfo.assessAnnual"
-        class="assess-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.assessAnnual" class="assess-select" clearable placeholder="请选择年份" style="width: 150px">
+        <el-option v-for="item in assessAnnualOpts" :key="item.id" :label="item.name" :value="item.value" />
       </el-select>
+
+      评价结果
+      <el-select v-model="selectInfo.annualAssessResult" class="assess-select" clearable placeholder="请选择考核结果" style="width: 150px">
+        <el-option v-for="item in assessResultOpts" :key="item.id" :label="item.name" :value="item.value" />
+      </el-select>
+
       <div class="assess-btns">
         <el-button type="primary" class="assess-button" @click="selectData">
           查询
@@ -51,16 +39,16 @@
         :row-style="{ 'text-align': 'center' }"
         style="width: 100%"
       >
-        <el-table-column type="index" label="序号" />
-        <el-table-column prop="supplierCode" label="供应商编号" width="180" />
+        <el-table-column type="index" label="序号" width="100" />
+        <el-table-column prop="supplierCode" label="供应商编号" width="200" />
         <el-table-column prop="supplierName" label="供应商名称" />
-        <el-table-column prop="supplierStatusName" label="供应商状态" />
-        <el-table-column prop="assessAnnualName" label="考核年度" />
-        <el-table-column prop="annualAssessResultName" label="考核结果" />
-        <el-table-column prop="annualAssessDate" label="考核日期" />
-        <el-table-column header-align="center" align="center" fixed="right" label="操作">
+        <el-table-column prop="supplierStatusName" label="供应商状态" width="100" />
+        <el-table-column prop="assessAnnualName" width="200" label="考核年度" />
+        <el-table-column prop="annualAssessResultName" width="200" label="考核结果" />
+        <el-table-column prop="annualAssessDate" width="200" label="考核日期" />
+        <el-table-column header-align="center" width="200" align="center" fixed="right" label="操作">
           <template slot-scope="scope">
-            <el-button type="text" size="small" @click="hitstoryDialog(scope.row)">
+            <el-button type="text" size="small" @click="historyDialog(scope.row)">
               历史考核
             </el-button>
             <el-button type="text" size="small" @click="assessDialogClick(scope.row)">
@@ -79,22 +67,28 @@
         @setLimit="setLimit"
       />
     </div>
-    <historyAssessDialog v-if="isShowHistoryDialog" :data-info="dataInfo" @close="assessHistoryDialogClose" />
-    <assessDialog v-if="isShowDialog" :data-info="dataInfo" @close="assessDialogClose" />
+    <history-assess-dialog ref="assessHis" />
+    <assess-dialog
+      ref="assessDialog"
+      @refreshList="selectData"
+      :assess-annual-opts="assessAnnualOpts"
+      :assess-result-opts="assessResultOpts"
+    />
   </div>
 </template>
 
 <script>
 import GroupPage from '../../components/mycomponent/groupPage.vue'
-import assessDialog from './assessDialog.vue'
-import historyAssessDialog from './historyAssessDialog.vue'
+import AssessDialog from '@/views/supplier/assessDialog'
+import HistoryAssessDialog from '@/views/supplier/historyAssessDialog'
 
 import { a_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: {
-    historyAssessDialog, assessDialog, GroupPage
+    HistoryAssessDialog, AssessDialog, GroupPage
   },
   mixins: [listMixin],
   data() {
@@ -105,36 +99,41 @@
       selectInfo: {
         supplierCode: '',
         supplierName: '',
-        assessAnnual: ''
+        assessAnnual: '',
+        annualAssessResult: ''
       },
-      options: [
-        { label: '2020', value: '2020' },
-        { label: '2021', value: '2021' },
-        { label: '2022', value: '2022' }
-      ]
+      assessAnnualOpts: [],
+      assessResultOpts: []
     }
   },
   mounted() {
+    this.getDictAssessAnnual()
+    this.getDictAssessResult()
   },
   methods: {
     tableRowClassName: tableRowClassName,
-    hitstoryDialog(row) {
-      this.dataInfo = row
-      this.isShowHistoryDialog = true
+    getDictAssessAnnual() {
+      getDictByCode('assessAnnual').then(response => {
+        if (response.code === 200) {
+          this.assessAnnualOpts = response.data
+        }
+      })
     },
-    assessHistoryDialogClose() {
-      this.isShowHistoryDialog = false
+    getDictAssessResult() {
+      getDictByCode('evaluateResult').then(response => {
+        if (response.code === 200) {
+          this.assessResultOpts = response.data
+        }
+      })
     },
-    assessDialogClose() {
-      this.isShowDialog = false
+    historyDialog(row) {
+      this.$refs.assessHis.initHistoryDialog(row)
     },
     assessDialogClick(row) {
-      this.dataInfo = row
-      this.isShowDialog = true
+      this.$refs.assessDialog.initDialog(row)
     },
-    getListPage(limit, offset) {
+    getListPage(limit = 10, offset = 1) {
       a_list(`limit=${limit}&offset=${offset}`, this.queryInfo).then(res => {
-        console.log(res)
         this.tableData = res
       })
     },
@@ -142,7 +141,8 @@
       this.selectInfo = { // 搜索框中的数据的数据
         supplierCode: '',
         supplierName: '',
-        assessAnnualName: ''
+        assessAnnual: '',
+        annualAssessResult: ''
       }
     }
   }
@@ -167,7 +167,7 @@
   }
 
   .assess-select {
-    margin: 0 4rem 0 0.5rem;
+    margin: 0 1rem 0 0.5rem;
   }
 
   .assess-btns {
diff --git a/src/views/supplier/assessDialog.vue b/src/views/supplier/assessDialog.vue
index fd4bc00..99f9ec1 100644
--- a/src/views/supplier/assessDialog.vue
+++ b/src/views/supplier/assessDialog.vue
@@ -1,126 +1,74 @@
 <!--年度考核弹窗-->
 <template>
-  <el-dialog title="年度考核" width="975px" :visible.sync="isShowInfo" append-to-body @close="close">
+  <el-dialog title="年度考核" width="60%" :visible.sync="isShowInfo" append-to-body :close-on-click-modal="false">
+    <el-form ref="assessForm" :model="addInfo" :rules="assessRules" 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="assessAnnual">
+            <el-select v-model="addInfo.assessAnnual" clearable placeholder="请选择年份" style="width: 100%">
+              <el-option v-for="item in assessAnnualOpts" :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="annualAssessResult">
+            <el-select v-model="addInfo.annualAssessResult" clearable placeholder="请选择考核结果" style="width: 100%">
+              <el-option v-for="item in assessResultOpts" :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="annualAssessDate">
+            <el-date-picker v-model="addInfo.annualAssessDate" 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.annualAssessIllustration" 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="assessFile"
+              action="action"
+              :file-list="annualAssessFileList"
+              :http-request="uploadAnnualAssessFile"
+              :before-upload="handleBeforeUpload"
+              :on-remove="handleAnnualAssessFileRemove"
+              :on-exceed="annualAssessFileExceed"
+              :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="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">
           保存
@@ -134,16 +82,13 @@
 </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'
+import { assessAdd } from '@/api/supplier/supplier'
+import { Uploadimg } from '@/api/common'
+import { getToday } from '@/utils/dateutils'
+
 export default {
   name: 'AssessDialog',
-  components: { inputVue, dialogHeader, RedStar },
   props: {
     assessAnnualOpts: {
       type: Array,
@@ -151,25 +96,18 @@
         return []
       },
       required: true
+    },
+    assessResultOpts: {
+      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' }
-      ],
+      isShowInfo: false,
       addInfo: {
         supplierCode: '',
         supplierName: '',
@@ -178,83 +116,145 @@
         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
+      assessRules: {
+        assessAnnual: [{ required: true, message: '请选择考核年份', trigger: 'change' }],
+        annualAssessResult: [{ required: true, message: '请选择考核结果', trigger: 'change' }],
+        annualAssessDate: [{ required: true, message: '请选择考核日期', trigger: 'blur' }]
+      },
+      annualAssessFileList: [],
+      assessValid: false
     }
   },
   methods: {
     close() {
-      this.$emit('close')
+      this.isShowInfo = false
+      this.$emit('refreshList')
     },
-    // 照片上传
-    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
+    initDialog(row) {
+      this.isShowInfo = true
+      if (row !== null) {
+        this.addInfo.supplierCode = row.supplierCode
+        this.addInfo.supplierName = row.supplierName
+        this.addInfo.annualAssessDate = getToday('yyyy-MM-dd')
       }
-      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('保存成功')
+      this.validateForm()
+      if (this.assessValid === true) {
+        if (this.annualAssessFileList.length > 0) {
+          for (const i in this.annualAssessFileList) {
+            this.addInfo.annualAssessFile += this.annualAssessFileList[i].url + ','
+          }
+
+          this.addInfo.annualAssessFile = this.addInfo.annualAssessFile.substring(0, this.addInfo.annualAssessFile.length - 1)
+        }
+
+        assessAdd(this.addInfo).then(res => {
+          if (!res.code) {
+            this.$message.success('保存成功')
+            this.clearForm()
+            this.close()
+          }
+        })
+      }
+    },
+    validateForm: function() {
+      this.$refs.assessForm.validate(valid => {
+        this.assessValid = valid
+      })
+    },
+    clearForm() {
+      this.addInfo = {
+        supplierCode: '',
+        supplierName: '',
+        assessAnnual: '',
+        annualAssessResult: '',
+        annualAssessIllustration: '',
+        annualAssessDate: '',
+        annualAssessFile: ''
+      }
+      this.annualAssessFileList = []
+      // 清除验证
+      this.$nextTick(() => {
+        this.$refs.assessForm.clearValidate()
+      })
+    },
+    uploadAnnualAssessFile(file) {
+      // 判断文件是否已经上传过
+      for (const i in this.annualAssessFileList) {
+        if (this.annualAssessFileList[i].name === file.name) {
+          this.$message.error('该文件已上传过，请选择其他文件')
+          this.handleFileNotUploaded(file, this.$refs.assessFile.uploadFiles)
+          return
+        }
+      }
+
+      Uploadimg(file).then(res => {
+        if (res.code === 200) {
+          this.annualAssessFileList.push({
+            name: res.data.fileName,
+            url: res.data.fileId,
+            type: file.file.type
+          })
+          this.$message.success('文件上传成功')
         }
       })
+    },
+    handleAnnualAssessFileRemove(file) {
+      this.handleRemove(file, this.annualAssessFileList)
+    },
+    annualAssessFileExceed(file, fileList) {
+      this.handleExceed(file, this.annualAssessFileList)
+    },
+    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)
+        }
+      }
     }
   }
 }
@@ -266,64 +266,6 @@
   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;
@@ -333,36 +275,9 @@
 
     .save,
     .close {
-      width: 100px;
+      width: 200px;
     }
-
   }
 }
 
-.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 fc318f0..3be46e0 100644
--- a/src/views/supplier/evaluate.vue
+++ b/src/views/supplier/evaluate.vue
@@ -79,10 +79,10 @@
     <history-evaluate-dialog ref="evaluateHis" />
     <evaluate-dialog
       ref="evaluateDialog"
-                     @refreshList="selectData"
-                     :evaluate-annual-opts="evaluateAnnualOpts"
-                     :evaluate-quarterly-opts="evaluateQuarterlyOpts"
-                     :evaluate-result-opts="evaluateResultOpts"
+      @refreshList="selectData"
+      :evaluate-annual-opts="evaluateAnnualOpts"
+      :evaluate-quarterly-opts="evaluateQuarterlyOpts"
+      :evaluate-result-opts="evaluateResultOpts"
     />
   </div>
 </template>
@@ -155,7 +155,6 @@
     },
     getListPage(limit = 10, offset = 1) {
       e_list(`limit=${limit}&offset=${offset}`, this.queryInfo).then(res => {
-        console.log(res)
         this.tableData = res
       })
     },

diff --git a/src/views/supplier/assess.vue b/src/views/supplier/assess.vue
index aa1b324..de44528 100644
--- a/src/views/supplier/assess.vue
+++ b/src/views/supplier/assess.vue
@@ -3,33 +3,21 @@
   <div class="assess">
     <div class="assess-inputs">
       供应商编号
-      <el-input
-        v-model="selectInfo.supplierCode"
-        style="width: 200px"
-        placeholder="请输入编号"
-        clearable
-        class="assess-input"
-      />
+      <el-input v-model="selectInfo.supplierCode" style="width: 200px" placeholder="请输入编号" clearable class="assess-input"/>
 
       供应商名称
-      <el-input
-        v-model="selectInfo.supplierName"
-        style="width: 200px"
-        placeholder="请输入供应商名称"
-        clearable
-        class="assess-input"
-      />
+      <el-input v-model="selectInfo.supplierName" style="width: 200px" placeholder="请输入供应商名称" clearable class="assess-input"/>
 
-      考核年度
-      <el-select
-        v-model="selectInfo.assessAnnual"
-        class="assess-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.assessAnnual" class="assess-select" clearable placeholder="请选择年份" style="width: 150px">
+        <el-option v-for="item in assessAnnualOpts" :key="item.id" :label="item.name" :value="item.value" />
       </el-select>
+
+      评价结果
+      <el-select v-model="selectInfo.annualAssessResult" class="assess-select" clearable placeholder="请选择考核结果" style="width: 150px">
+        <el-option v-for="item in assessResultOpts" :key="item.id" :label="item.name" :value="item.value" />
+      </el-select>
+
       <div class="assess-btns">
         <el-button type="primary" class="assess-button" @click="selectData">
           查询
@@ -51,16 +39,16 @@
         :row-style="{ 'text-align': 'center' }"
         style="width: 100%"
       >
-        <el-table-column type="index" label="序号" />
-        <el-table-column prop="supplierCode" label="供应商编号" width="180" />
+        <el-table-column type="index" label="序号" width="100" />
+        <el-table-column prop="supplierCode" label="供应商编号" width="200" />
         <el-table-column prop="supplierName" label="供应商名称" />
-        <el-table-column prop="supplierStatusName" label="供应商状态" />
-        <el-table-column prop="assessAnnualName" label="考核年度" />
-        <el-table-column prop="annualAssessResultName" label="考核结果" />
-        <el-table-column prop="annualAssessDate" label="考核日期" />
-        <el-table-column header-align="center" align="center" fixed="right" label="操作">
+        <el-table-column prop="supplierStatusName" label="供应商状态" width="100" />
+        <el-table-column prop="assessAnnualName" width="200" label="考核年度" />
+        <el-table-column prop="annualAssessResultName" width="200" label="考核结果" />
+        <el-table-column prop="annualAssessDate" width="200" label="考核日期" />
+        <el-table-column header-align="center" width="200" align="center" fixed="right" label="操作">
           <template slot-scope="scope">
-            <el-button type="text" size="small" @click="hitstoryDialog(scope.row)">
+            <el-button type="text" size="small" @click="historyDialog(scope.row)">
               历史考核
             </el-button>
             <el-button type="text" size="small" @click="assessDialogClick(scope.row)">
@@ -79,22 +67,28 @@
         @setLimit="setLimit"
       />
     </div>
-    <historyAssessDialog v-if="isShowHistoryDialog" :data-info="dataInfo" @close="assessHistoryDialogClose" />
-    <assessDialog v-if="isShowDialog" :data-info="dataInfo" @close="assessDialogClose" />
+    <history-assess-dialog ref="assessHis" />
+    <assess-dialog
+      ref="assessDialog"
+      @refreshList="selectData"
+      :assess-annual-opts="assessAnnualOpts"
+      :assess-result-opts="assessResultOpts"
+    />
   </div>
 </template>
 
 <script>
 import GroupPage from '../../components/mycomponent/groupPage.vue'
-import assessDialog from './assessDialog.vue'
-import historyAssessDialog from './historyAssessDialog.vue'
+import AssessDialog from '@/views/supplier/assessDialog'
+import HistoryAssessDialog from '@/views/supplier/historyAssessDialog'
 
 import { a_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: {
-    historyAssessDialog, assessDialog, GroupPage
+    HistoryAssessDialog, AssessDialog, GroupPage
   },
   mixins: [listMixin],
   data() {
@@ -105,36 +99,41 @@
       selectInfo: {
         supplierCode: '',
         supplierName: '',
-        assessAnnual: ''
+        assessAnnual: '',
+        annualAssessResult: ''
       },
-      options: [
-        { label: '2020', value: '2020' },
-        { label: '2021', value: '2021' },
-        { label: '2022', value: '2022' }
-      ]
+      assessAnnualOpts: [],
+      assessResultOpts: []
     }
   },
   mounted() {
+    this.getDictAssessAnnual()
+    this.getDictAssessResult()
   },
   methods: {
     tableRowClassName: tableRowClassName,
-    hitstoryDialog(row) {
-      this.dataInfo = row
-      this.isShowHistoryDialog = true
+    getDictAssessAnnual() {
+      getDictByCode('assessAnnual').then(response => {
+        if (response.code === 200) {
+          this.assessAnnualOpts = response.data
+        }
+      })
     },
-    assessHistoryDialogClose() {
-      this.isShowHistoryDialog = false
+    getDictAssessResult() {
+      getDictByCode('evaluateResult').then(response => {
+        if (response.code === 200) {
+          this.assessResultOpts = response.data
+        }
+      })
     },
-    assessDialogClose() {
-      this.isShowDialog = false
+    historyDialog(row) {
+      this.$refs.assessHis.initHistoryDialog(row)
     },
     assessDialogClick(row) {
-      this.dataInfo = row
-      this.isShowDialog = true
+      this.$refs.assessDialog.initDialog(row)
     },
-    getListPage(limit, offset) {
+    getListPage(limit = 10, offset = 1) {
       a_list(`limit=${limit}&offset=${offset}`, this.queryInfo).then(res => {
-        console.log(res)
         this.tableData = res
       })
     },
@@ -142,7 +141,8 @@
       this.selectInfo = { // 搜索框中的数据的数据
         supplierCode: '',
         supplierName: '',
-        assessAnnualName: ''
+        assessAnnual: '',
+        annualAssessResult: ''
       }
     }
   }
@@ -167,7 +167,7 @@
   }
 
   .assess-select {
-    margin: 0 4rem 0 0.5rem;
+    margin: 0 1rem 0 0.5rem;
   }
 
   .assess-btns {
diff --git a/src/views/supplier/assessDialog.vue b/src/views/supplier/assessDialog.vue
index fd4bc00..99f9ec1 100644
--- a/src/views/supplier/assessDialog.vue
+++ b/src/views/supplier/assessDialog.vue
@@ -1,126 +1,74 @@
 <!--年度考核弹窗-->
 <template>
-  <el-dialog title="年度考核" width="975px" :visible.sync="isShowInfo" append-to-body @close="close">
+  <el-dialog title="年度考核" width="60%" :visible.sync="isShowInfo" append-to-body :close-on-click-modal="false">
+    <el-form ref="assessForm" :model="addInfo" :rules="assessRules" 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="assessAnnual">
+            <el-select v-model="addInfo.assessAnnual" clearable placeholder="请选择年份" style="width: 100%">
+              <el-option v-for="item in assessAnnualOpts" :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="annualAssessResult">
+            <el-select v-model="addInfo.annualAssessResult" clearable placeholder="请选择考核结果" style="width: 100%">
+              <el-option v-for="item in assessResultOpts" :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="annualAssessDate">
+            <el-date-picker v-model="addInfo.annualAssessDate" 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.annualAssessIllustration" 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="assessFile"
+              action="action"
+              :file-list="annualAssessFileList"
+              :http-request="uploadAnnualAssessFile"
+              :before-upload="handleBeforeUpload"
+              :on-remove="handleAnnualAssessFileRemove"
+              :on-exceed="annualAssessFileExceed"
+              :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="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">
           保存
@@ -134,16 +82,13 @@
 </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'
+import { assessAdd } from '@/api/supplier/supplier'
+import { Uploadimg } from '@/api/common'
+import { getToday } from '@/utils/dateutils'
+
 export default {
   name: 'AssessDialog',
-  components: { inputVue, dialogHeader, RedStar },
   props: {
     assessAnnualOpts: {
       type: Array,
@@ -151,25 +96,18 @@
         return []
       },
       required: true
+    },
+    assessResultOpts: {
+      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' }
-      ],
+      isShowInfo: false,
       addInfo: {
         supplierCode: '',
         supplierName: '',
@@ -178,83 +116,145 @@
         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
+      assessRules: {
+        assessAnnual: [{ required: true, message: '请选择考核年份', trigger: 'change' }],
+        annualAssessResult: [{ required: true, message: '请选择考核结果', trigger: 'change' }],
+        annualAssessDate: [{ required: true, message: '请选择考核日期', trigger: 'blur' }]
+      },
+      annualAssessFileList: [],
+      assessValid: false
     }
   },
   methods: {
     close() {
-      this.$emit('close')
+      this.isShowInfo = false
+      this.$emit('refreshList')
     },
-    // 照片上传
-    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
+    initDialog(row) {
+      this.isShowInfo = true
+      if (row !== null) {
+        this.addInfo.supplierCode = row.supplierCode
+        this.addInfo.supplierName = row.supplierName
+        this.addInfo.annualAssessDate = getToday('yyyy-MM-dd')
       }
-      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('保存成功')
+      this.validateForm()
+      if (this.assessValid === true) {
+        if (this.annualAssessFileList.length > 0) {
+          for (const i in this.annualAssessFileList) {
+            this.addInfo.annualAssessFile += this.annualAssessFileList[i].url + ','
+          }
+
+          this.addInfo.annualAssessFile = this.addInfo.annualAssessFile.substring(0, this.addInfo.annualAssessFile.length - 1)
+        }
+
+        assessAdd(this.addInfo).then(res => {
+          if (!res.code) {
+            this.$message.success('保存成功')
+            this.clearForm()
+            this.close()
+          }
+        })
+      }
+    },
+    validateForm: function() {
+      this.$refs.assessForm.validate(valid => {
+        this.assessValid = valid
+      })
+    },
+    clearForm() {
+      this.addInfo = {
+        supplierCode: '',
+        supplierName: '',
+        assessAnnual: '',
+        annualAssessResult: '',
+        annualAssessIllustration: '',
+        annualAssessDate: '',
+        annualAssessFile: ''
+      }
+      this.annualAssessFileList = []
+      // 清除验证
+      this.$nextTick(() => {
+        this.$refs.assessForm.clearValidate()
+      })
+    },
+    uploadAnnualAssessFile(file) {
+      // 判断文件是否已经上传过
+      for (const i in this.annualAssessFileList) {
+        if (this.annualAssessFileList[i].name === file.name) {
+          this.$message.error('该文件已上传过，请选择其他文件')
+          this.handleFileNotUploaded(file, this.$refs.assessFile.uploadFiles)
+          return
+        }
+      }
+
+      Uploadimg(file).then(res => {
+        if (res.code === 200) {
+          this.annualAssessFileList.push({
+            name: res.data.fileName,
+            url: res.data.fileId,
+            type: file.file.type
+          })
+          this.$message.success('文件上传成功')
         }
       })
+    },
+    handleAnnualAssessFileRemove(file) {
+      this.handleRemove(file, this.annualAssessFileList)
+    },
+    annualAssessFileExceed(file, fileList) {
+      this.handleExceed(file, this.annualAssessFileList)
+    },
+    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)
+        }
+      }
     }
   }
 }
@@ -266,64 +266,6 @@
   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;
@@ -333,36 +275,9 @@
 
     .save,
     .close {
-      width: 100px;
+      width: 200px;
     }
-
   }
 }
 
-.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 fc318f0..3be46e0 100644
--- a/src/views/supplier/evaluate.vue
+++ b/src/views/supplier/evaluate.vue
@@ -79,10 +79,10 @@
     <history-evaluate-dialog ref="evaluateHis" />
     <evaluate-dialog
       ref="evaluateDialog"
-                     @refreshList="selectData"
-                     :evaluate-annual-opts="evaluateAnnualOpts"
-                     :evaluate-quarterly-opts="evaluateQuarterlyOpts"
-                     :evaluate-result-opts="evaluateResultOpts"
+      @refreshList="selectData"
+      :evaluate-annual-opts="evaluateAnnualOpts"
+      :evaluate-quarterly-opts="evaluateQuarterlyOpts"
+      :evaluate-result-opts="evaluateResultOpts"
     />
   </div>
 </template>
@@ -155,7 +155,6 @@
     },
     getListPage(limit = 10, offset = 1) {
       e_list(`limit=${limit}&offset=${offset}`, this.queryInfo).then(res => {
-        console.log(res)
         this.tableData = res
       })
     },
diff --git a/src/views/supplier/evaluateDialog.vue b/src/views/supplier/evaluateDialog.vue
index 0430118..cba9c96 100644
--- a/src/views/supplier/evaluateDialog.vue
+++ b/src/views/supplier/evaluateDialog.vue
@@ -67,7 +67,7 @@
               accept=".jpg,.jpeg,.png,.pdf,.doc,.docx,.zip,.rar"
             >
               <el-button type="primary" icon="el-icon-upload">
-                上传录库评审结果附件
+                上传季度评价结果附件
               </el-button>
             </el-upload>
           </el-form-item>
@@ -122,15 +122,6 @@
   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: '',

diff --git a/src/views/supplier/assess.vue b/src/views/supplier/assess.vue
index aa1b324..de44528 100644
--- a/src/views/supplier/assess.vue
+++ b/src/views/supplier/assess.vue
@@ -3,33 +3,21 @@
   <div class="assess">
     <div class="assess-inputs">
       供应商编号
-      <el-input
-        v-model="selectInfo.supplierCode"
-        style="width: 200px"
-        placeholder="请输入编号"
-        clearable
-        class="assess-input"
-      />
+      <el-input v-model="selectInfo.supplierCode" style="width: 200px" placeholder="请输入编号" clearable class="assess-input"/>
 
       供应商名称
-      <el-input
-        v-model="selectInfo.supplierName"
-        style="width: 200px"
-        placeholder="请输入供应商名称"
-        clearable
-        class="assess-input"
-      />
+      <el-input v-model="selectInfo.supplierName" style="width: 200px" placeholder="请输入供应商名称" clearable class="assess-input"/>
 
-      考核年度
-      <el-select
-        v-model="selectInfo.assessAnnual"
-        class="assess-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.assessAnnual" class="assess-select" clearable placeholder="请选择年份" style="width: 150px">
+        <el-option v-for="item in assessAnnualOpts" :key="item.id" :label="item.name" :value="item.value" />
       </el-select>
+
+      评价结果
+      <el-select v-model="selectInfo.annualAssessResult" class="assess-select" clearable placeholder="请选择考核结果" style="width: 150px">
+        <el-option v-for="item in assessResultOpts" :key="item.id" :label="item.name" :value="item.value" />
+      </el-select>
+
       <div class="assess-btns">
         <el-button type="primary" class="assess-button" @click="selectData">
           查询
@@ -51,16 +39,16 @@
         :row-style="{ 'text-align': 'center' }"
         style="width: 100%"
       >
-        <el-table-column type="index" label="序号" />
-        <el-table-column prop="supplierCode" label="供应商编号" width="180" />
+        <el-table-column type="index" label="序号" width="100" />
+        <el-table-column prop="supplierCode" label="供应商编号" width="200" />
         <el-table-column prop="supplierName" label="供应商名称" />
-        <el-table-column prop="supplierStatusName" label="供应商状态" />
-        <el-table-column prop="assessAnnualName" label="考核年度" />
-        <el-table-column prop="annualAssessResultName" label="考核结果" />
-        <el-table-column prop="annualAssessDate" label="考核日期" />
-        <el-table-column header-align="center" align="center" fixed="right" label="操作">
+        <el-table-column prop="supplierStatusName" label="供应商状态" width="100" />
+        <el-table-column prop="assessAnnualName" width="200" label="考核年度" />
+        <el-table-column prop="annualAssessResultName" width="200" label="考核结果" />
+        <el-table-column prop="annualAssessDate" width="200" label="考核日期" />
+        <el-table-column header-align="center" width="200" align="center" fixed="right" label="操作">
           <template slot-scope="scope">
-            <el-button type="text" size="small" @click="hitstoryDialog(scope.row)">
+            <el-button type="text" size="small" @click="historyDialog(scope.row)">
               历史考核
             </el-button>
             <el-button type="text" size="small" @click="assessDialogClick(scope.row)">
@@ -79,22 +67,28 @@
         @setLimit="setLimit"
       />
     </div>
-    <historyAssessDialog v-if="isShowHistoryDialog" :data-info="dataInfo" @close="assessHistoryDialogClose" />
-    <assessDialog v-if="isShowDialog" :data-info="dataInfo" @close="assessDialogClose" />
+    <history-assess-dialog ref="assessHis" />
+    <assess-dialog
+      ref="assessDialog"
+      @refreshList="selectData"
+      :assess-annual-opts="assessAnnualOpts"
+      :assess-result-opts="assessResultOpts"
+    />
   </div>
 </template>
 
 <script>
 import GroupPage from '../../components/mycomponent/groupPage.vue'
-import assessDialog from './assessDialog.vue'
-import historyAssessDialog from './historyAssessDialog.vue'
+import AssessDialog from '@/views/supplier/assessDialog'
+import HistoryAssessDialog from '@/views/supplier/historyAssessDialog'
 
 import { a_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: {
-    historyAssessDialog, assessDialog, GroupPage
+    HistoryAssessDialog, AssessDialog, GroupPage
   },
   mixins: [listMixin],
   data() {
@@ -105,36 +99,41 @@
       selectInfo: {
         supplierCode: '',
         supplierName: '',
-        assessAnnual: ''
+        assessAnnual: '',
+        annualAssessResult: ''
       },
-      options: [
-        { label: '2020', value: '2020' },
-        { label: '2021', value: '2021' },
-        { label: '2022', value: '2022' }
-      ]
+      assessAnnualOpts: [],
+      assessResultOpts: []
     }
   },
   mounted() {
+    this.getDictAssessAnnual()
+    this.getDictAssessResult()
   },
   methods: {
     tableRowClassName: tableRowClassName,
-    hitstoryDialog(row) {
-      this.dataInfo = row
-      this.isShowHistoryDialog = true
+    getDictAssessAnnual() {
+      getDictByCode('assessAnnual').then(response => {
+        if (response.code === 200) {
+          this.assessAnnualOpts = response.data
+        }
+      })
     },
-    assessHistoryDialogClose() {
-      this.isShowHistoryDialog = false
+    getDictAssessResult() {
+      getDictByCode('evaluateResult').then(response => {
+        if (response.code === 200) {
+          this.assessResultOpts = response.data
+        }
+      })
     },
-    assessDialogClose() {
-      this.isShowDialog = false
+    historyDialog(row) {
+      this.$refs.assessHis.initHistoryDialog(row)
     },
     assessDialogClick(row) {
-      this.dataInfo = row
-      this.isShowDialog = true
+      this.$refs.assessDialog.initDialog(row)
     },
-    getListPage(limit, offset) {
+    getListPage(limit = 10, offset = 1) {
       a_list(`limit=${limit}&offset=${offset}`, this.queryInfo).then(res => {
-        console.log(res)
         this.tableData = res
       })
     },
@@ -142,7 +141,8 @@
       this.selectInfo = { // 搜索框中的数据的数据
         supplierCode: '',
         supplierName: '',
-        assessAnnualName: ''
+        assessAnnual: '',
+        annualAssessResult: ''
       }
     }
   }
@@ -167,7 +167,7 @@
   }
 
   .assess-select {
-    margin: 0 4rem 0 0.5rem;
+    margin: 0 1rem 0 0.5rem;
   }
 
   .assess-btns {
diff --git a/src/views/supplier/assessDialog.vue b/src/views/supplier/assessDialog.vue
index fd4bc00..99f9ec1 100644
--- a/src/views/supplier/assessDialog.vue
+++ b/src/views/supplier/assessDialog.vue
@@ -1,126 +1,74 @@
 <!--年度考核弹窗-->
 <template>
-  <el-dialog title="年度考核" width="975px" :visible.sync="isShowInfo" append-to-body @close="close">
+  <el-dialog title="年度考核" width="60%" :visible.sync="isShowInfo" append-to-body :close-on-click-modal="false">
+    <el-form ref="assessForm" :model="addInfo" :rules="assessRules" 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="assessAnnual">
+            <el-select v-model="addInfo.assessAnnual" clearable placeholder="请选择年份" style="width: 100%">
+              <el-option v-for="item in assessAnnualOpts" :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="annualAssessResult">
+            <el-select v-model="addInfo.annualAssessResult" clearable placeholder="请选择考核结果" style="width: 100%">
+              <el-option v-for="item in assessResultOpts" :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="annualAssessDate">
+            <el-date-picker v-model="addInfo.annualAssessDate" 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.annualAssessIllustration" 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="assessFile"
+              action="action"
+              :file-list="annualAssessFileList"
+              :http-request="uploadAnnualAssessFile"
+              :before-upload="handleBeforeUpload"
+              :on-remove="handleAnnualAssessFileRemove"
+              :on-exceed="annualAssessFileExceed"
+              :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="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">
           保存
@@ -134,16 +82,13 @@
 </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'
+import { assessAdd } from '@/api/supplier/supplier'
+import { Uploadimg } from '@/api/common'
+import { getToday } from '@/utils/dateutils'
+
 export default {
   name: 'AssessDialog',
-  components: { inputVue, dialogHeader, RedStar },
   props: {
     assessAnnualOpts: {
       type: Array,
@@ -151,25 +96,18 @@
         return []
       },
       required: true
+    },
+    assessResultOpts: {
+      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' }
-      ],
+      isShowInfo: false,
       addInfo: {
         supplierCode: '',
         supplierName: '',
@@ -178,83 +116,145 @@
         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
+      assessRules: {
+        assessAnnual: [{ required: true, message: '请选择考核年份', trigger: 'change' }],
+        annualAssessResult: [{ required: true, message: '请选择考核结果', trigger: 'change' }],
+        annualAssessDate: [{ required: true, message: '请选择考核日期', trigger: 'blur' }]
+      },
+      annualAssessFileList: [],
+      assessValid: false
     }
   },
   methods: {
     close() {
-      this.$emit('close')
+      this.isShowInfo = false
+      this.$emit('refreshList')
     },
-    // 照片上传
-    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
+    initDialog(row) {
+      this.isShowInfo = true
+      if (row !== null) {
+        this.addInfo.supplierCode = row.supplierCode
+        this.addInfo.supplierName = row.supplierName
+        this.addInfo.annualAssessDate = getToday('yyyy-MM-dd')
       }
-      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('保存成功')
+      this.validateForm()
+      if (this.assessValid === true) {
+        if (this.annualAssessFileList.length > 0) {
+          for (const i in this.annualAssessFileList) {
+            this.addInfo.annualAssessFile += this.annualAssessFileList[i].url + ','
+          }
+
+          this.addInfo.annualAssessFile = this.addInfo.annualAssessFile.substring(0, this.addInfo.annualAssessFile.length - 1)
+        }
+
+        assessAdd(this.addInfo).then(res => {
+          if (!res.code) {
+            this.$message.success('保存成功')
+            this.clearForm()
+            this.close()
+          }
+        })
+      }
+    },
+    validateForm: function() {
+      this.$refs.assessForm.validate(valid => {
+        this.assessValid = valid
+      })
+    },
+    clearForm() {
+      this.addInfo = {
+        supplierCode: '',
+        supplierName: '',
+        assessAnnual: '',
+        annualAssessResult: '',
+        annualAssessIllustration: '',
+        annualAssessDate: '',
+        annualAssessFile: ''
+      }
+      this.annualAssessFileList = []
+      // 清除验证
+      this.$nextTick(() => {
+        this.$refs.assessForm.clearValidate()
+      })
+    },
+    uploadAnnualAssessFile(file) {
+      // 判断文件是否已经上传过
+      for (const i in this.annualAssessFileList) {
+        if (this.annualAssessFileList[i].name === file.name) {
+          this.$message.error('该文件已上传过，请选择其他文件')
+          this.handleFileNotUploaded(file, this.$refs.assessFile.uploadFiles)
+          return
+        }
+      }
+
+      Uploadimg(file).then(res => {
+        if (res.code === 200) {
+          this.annualAssessFileList.push({
+            name: res.data.fileName,
+            url: res.data.fileId,
+            type: file.file.type
+          })
+          this.$message.success('文件上传成功')
         }
       })
+    },
+    handleAnnualAssessFileRemove(file) {
+      this.handleRemove(file, this.annualAssessFileList)
+    },
+    annualAssessFileExceed(file, fileList) {
+      this.handleExceed(file, this.annualAssessFileList)
+    },
+    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)
+        }
+      }
     }
   }
 }
@@ -266,64 +266,6 @@
   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;
@@ -333,36 +275,9 @@
 
     .save,
     .close {
-      width: 100px;
+      width: 200px;
     }
-
   }
 }
 
-.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 fc318f0..3be46e0 100644
--- a/src/views/supplier/evaluate.vue
+++ b/src/views/supplier/evaluate.vue
@@ -79,10 +79,10 @@
     <history-evaluate-dialog ref="evaluateHis" />
     <evaluate-dialog
       ref="evaluateDialog"
-                     @refreshList="selectData"
-                     :evaluate-annual-opts="evaluateAnnualOpts"
-                     :evaluate-quarterly-opts="evaluateQuarterlyOpts"
-                     :evaluate-result-opts="evaluateResultOpts"
+      @refreshList="selectData"
+      :evaluate-annual-opts="evaluateAnnualOpts"
+      :evaluate-quarterly-opts="evaluateQuarterlyOpts"
+      :evaluate-result-opts="evaluateResultOpts"
     />
   </div>
 </template>
@@ -155,7 +155,6 @@
     },
     getListPage(limit = 10, offset = 1) {
       e_list(`limit=${limit}&offset=${offset}`, this.queryInfo).then(res => {
-        console.log(res)
         this.tableData = res
       })
     },
diff --git a/src/views/supplier/evaluateDialog.vue b/src/views/supplier/evaluateDialog.vue
index 0430118..cba9c96 100644
--- a/src/views/supplier/evaluateDialog.vue
+++ b/src/views/supplier/evaluateDialog.vue
@@ -67,7 +67,7 @@
               accept=".jpg,.jpeg,.png,.pdf,.doc,.docx,.zip,.rar"
             >
               <el-button type="primary" icon="el-icon-upload">
-                上传录库评审结果附件
+                上传季度评价结果附件
               </el-button>
             </el-upload>
           </el-form-item>
@@ -122,15 +122,6 @@
   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: '',
diff --git a/src/views/supplier/historyAssessDialog.vue b/src/views/supplier/historyAssessDialog.vue
index 83694dd..7560e0a 100644
--- a/src/views/supplier/historyAssessDialog.vue
+++ b/src/views/supplier/historyAssessDialog.vue
@@ -1,111 +1,71 @@
 <!--历史考核弹窗-->
 <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>
+  <el-dialog title="年度考核记录" width="60%" :visible.sync="isShowInfo" append-to-body :close-on-click-modal="false">
+    <el-descriptions class="margin-top" title="" :column="2" border style="width: 100%">
+      <el-descriptions-item label="供应商名称" :label-style="labelStyle" :content-style="contentStyle">{{ dataInfo.supplierName }}</el-descriptions-item>
+      <el-descriptions-item label="供应商编号" :label-style="labelStyle">{{ dataInfo.supplierCode }}</el-descriptions-item>
+      <el-descriptions-item label="供应商状态">{{ dataInfo.supplierStatusName }}</el-descriptions-item>
+    </el-descriptions>
+
+    <div style="margin-top: 30px; font-size: 1rem">考核记录</div>
+    <el-table :data="tableData" style="width: 100%" max-height="400px" :highlight-current-row="true">
+      <el-table-column label="序号" width="75">
+        <template scope="scope">
+          <span>{{ scope.$index + 1 }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="assessAnnualName" label="考核年度" width="200"></el-table-column>
+      <el-table-column prop="annualAssessResultName" label="考核结果" width="150"></el-table-column>
+      <el-table-column prop="annualAssessIllustration" label="考核结果说明"></el-table-column>
+      <el-table-column prop="annualAssessDate" label="考核日期" width="150" />
+      <el-table-column label="考核结果附件" width="300">
+        <template slot-scope="scope">
+          <el-link v-for="(item, index) in scope.row.annualAssessFileList" :key="item.id" :href="baseUrl + item" :disabled="item === ''" type="primary" target="_blank" style="margin-right: 10px;">附件{{ index + 1 }}</el-link>
+        </template>
+      </el-table-column>
+    </el-table>
+  </el-dialog>
 </template>
 
 <script>
-import dialogHeader from '../../components/mycomponent/dialog/dialogHeader.vue'
-import inputVue from '../../components/mycomponent/input/inputVue.vue'
-import RedStar from '../../components/mycomponent/redStar.vue'
 
-import { historyAssess } from '../../api/supplier/supplier'
+import { historyAssess } from '@/api/supplier/supplier'
 
 export default {
-  components: { inputVue, dialogHeader, RedStar },
-  props: {
-    dataInfo: {
-      type: Object,
-      dataInfo: {}
-    }
-  },
+  name: 'HistoryAssessDialog',
   data() {
     return {
-      tableData: []
+      isShowInfo: false,
+      tableData: [],
+      dataInfo: {
+
+      },
+      baseUrl: '',
+      labelStyle: {
+        width: '20%'
+      },
+      contentStyle: {
+        width: '30%'
+      }
     }
   },
-  mounted() {
-    this.getHistoryAssess()
-  },
   methods: {
-    // 生成序号
-    indexMethod(index) {
-      return index + 1
+    initHistoryDialog(row) {
+      this.dataInfo = row
+      this.getHistoryAssess(row.supplierCode)
+      this.isShowInfo = true
+      this.baseUrl = this.baseConfig.baseUrl + '/static/'
     },
-    // 合并表头
-    headerStyle({ row, column, rowIndex, columnIndex }) {
-      row[5].colSpan = 2 // 第三列的表头占据2个单元格
-      row[6].colSpan = 0
-      if (columnIndex === 6) {
-        return 'display: none'
-      }
-    },
-    close() {
-      this.$emit('close')
-    },
-    getHistoryAssess() {
-      historyAssess().then(res => {
-        console.log(res)
+    getHistoryAssess(supplierCode) {
+      historyAssess({ supplierCode: supplierCode }).then(res => {
+        res.forEach(record => {
+          if (record.annualAssessDate !== '' && record.annualAssessDate.length > 10) {
+            record.annualAssessDate = record.annualAssessDate.substring(0, 10)
+          }
+          if (record.annualAssessFile !== '') {
+            record.annualAssessFileList = record.annualAssessFile.split(',')
+          }
+        })
         this.tableData = res
       })
     }
@@ -114,33 +74,5 @@
 </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/assess.vue b/src/views/supplier/assess.vue
index aa1b324..de44528 100644
--- a/src/views/supplier/assess.vue
+++ b/src/views/supplier/assess.vue
@@ -3,33 +3,21 @@
   <div class="assess">
     <div class="assess-inputs">
       供应商编号
-      <el-input
-        v-model="selectInfo.supplierCode"
-        style="width: 200px"
-        placeholder="请输入编号"
-        clearable
-        class="assess-input"
-      />
+      <el-input v-model="selectInfo.supplierCode" style="width: 200px" placeholder="请输入编号" clearable class="assess-input"/>
 
       供应商名称
-      <el-input
-        v-model="selectInfo.supplierName"
-        style="width: 200px"
-        placeholder="请输入供应商名称"
-        clearable
-        class="assess-input"
-      />
+      <el-input v-model="selectInfo.supplierName" style="width: 200px" placeholder="请输入供应商名称" clearable class="assess-input"/>
 
-      考核年度
-      <el-select
-        v-model="selectInfo.assessAnnual"
-        class="assess-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.assessAnnual" class="assess-select" clearable placeholder="请选择年份" style="width: 150px">
+        <el-option v-for="item in assessAnnualOpts" :key="item.id" :label="item.name" :value="item.value" />
       </el-select>
+
+      评价结果
+      <el-select v-model="selectInfo.annualAssessResult" class="assess-select" clearable placeholder="请选择考核结果" style="width: 150px">
+        <el-option v-for="item in assessResultOpts" :key="item.id" :label="item.name" :value="item.value" />
+      </el-select>
+
       <div class="assess-btns">
         <el-button type="primary" class="assess-button" @click="selectData">
           查询
@@ -51,16 +39,16 @@
         :row-style="{ 'text-align': 'center' }"
         style="width: 100%"
       >
-        <el-table-column type="index" label="序号" />
-        <el-table-column prop="supplierCode" label="供应商编号" width="180" />
+        <el-table-column type="index" label="序号" width="100" />
+        <el-table-column prop="supplierCode" label="供应商编号" width="200" />
         <el-table-column prop="supplierName" label="供应商名称" />
-        <el-table-column prop="supplierStatusName" label="供应商状态" />
-        <el-table-column prop="assessAnnualName" label="考核年度" />
-        <el-table-column prop="annualAssessResultName" label="考核结果" />
-        <el-table-column prop="annualAssessDate" label="考核日期" />
-        <el-table-column header-align="center" align="center" fixed="right" label="操作">
+        <el-table-column prop="supplierStatusName" label="供应商状态" width="100" />
+        <el-table-column prop="assessAnnualName" width="200" label="考核年度" />
+        <el-table-column prop="annualAssessResultName" width="200" label="考核结果" />
+        <el-table-column prop="annualAssessDate" width="200" label="考核日期" />
+        <el-table-column header-align="center" width="200" align="center" fixed="right" label="操作">
           <template slot-scope="scope">
-            <el-button type="text" size="small" @click="hitstoryDialog(scope.row)">
+            <el-button type="text" size="small" @click="historyDialog(scope.row)">
               历史考核
             </el-button>
             <el-button type="text" size="small" @click="assessDialogClick(scope.row)">
@@ -79,22 +67,28 @@
         @setLimit="setLimit"
       />
     </div>
-    <historyAssessDialog v-if="isShowHistoryDialog" :data-info="dataInfo" @close="assessHistoryDialogClose" />
-    <assessDialog v-if="isShowDialog" :data-info="dataInfo" @close="assessDialogClose" />
+    <history-assess-dialog ref="assessHis" />
+    <assess-dialog
+      ref="assessDialog"
+      @refreshList="selectData"
+      :assess-annual-opts="assessAnnualOpts"
+      :assess-result-opts="assessResultOpts"
+    />
   </div>
 </template>
 
 <script>
 import GroupPage from '../../components/mycomponent/groupPage.vue'
-import assessDialog from './assessDialog.vue'
-import historyAssessDialog from './historyAssessDialog.vue'
+import AssessDialog from '@/views/supplier/assessDialog'
+import HistoryAssessDialog from '@/views/supplier/historyAssessDialog'
 
 import { a_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: {
-    historyAssessDialog, assessDialog, GroupPage
+    HistoryAssessDialog, AssessDialog, GroupPage
   },
   mixins: [listMixin],
   data() {
@@ -105,36 +99,41 @@
       selectInfo: {
         supplierCode: '',
         supplierName: '',
-        assessAnnual: ''
+        assessAnnual: '',
+        annualAssessResult: ''
       },
-      options: [
-        { label: '2020', value: '2020' },
-        { label: '2021', value: '2021' },
-        { label: '2022', value: '2022' }
-      ]
+      assessAnnualOpts: [],
+      assessResultOpts: []
     }
   },
   mounted() {
+    this.getDictAssessAnnual()
+    this.getDictAssessResult()
   },
   methods: {
     tableRowClassName: tableRowClassName,
-    hitstoryDialog(row) {
-      this.dataInfo = row
-      this.isShowHistoryDialog = true
+    getDictAssessAnnual() {
+      getDictByCode('assessAnnual').then(response => {
+        if (response.code === 200) {
+          this.assessAnnualOpts = response.data
+        }
+      })
     },
-    assessHistoryDialogClose() {
-      this.isShowHistoryDialog = false
+    getDictAssessResult() {
+      getDictByCode('evaluateResult').then(response => {
+        if (response.code === 200) {
+          this.assessResultOpts = response.data
+        }
+      })
     },
-    assessDialogClose() {
-      this.isShowDialog = false
+    historyDialog(row) {
+      this.$refs.assessHis.initHistoryDialog(row)
     },
     assessDialogClick(row) {
-      this.dataInfo = row
-      this.isShowDialog = true
+      this.$refs.assessDialog.initDialog(row)
     },
-    getListPage(limit, offset) {
+    getListPage(limit = 10, offset = 1) {
       a_list(`limit=${limit}&offset=${offset}`, this.queryInfo).then(res => {
-        console.log(res)
         this.tableData = res
       })
     },
@@ -142,7 +141,8 @@
       this.selectInfo = { // 搜索框中的数据的数据
         supplierCode: '',
         supplierName: '',
-        assessAnnualName: ''
+        assessAnnual: '',
+        annualAssessResult: ''
       }
     }
   }
@@ -167,7 +167,7 @@
   }
 
   .assess-select {
-    margin: 0 4rem 0 0.5rem;
+    margin: 0 1rem 0 0.5rem;
   }
 
   .assess-btns {
diff --git a/src/views/supplier/assessDialog.vue b/src/views/supplier/assessDialog.vue
index fd4bc00..99f9ec1 100644
--- a/src/views/supplier/assessDialog.vue
+++ b/src/views/supplier/assessDialog.vue
@@ -1,126 +1,74 @@
 <!--年度考核弹窗-->
 <template>
-  <el-dialog title="年度考核" width="975px" :visible.sync="isShowInfo" append-to-body @close="close">
+  <el-dialog title="年度考核" width="60%" :visible.sync="isShowInfo" append-to-body :close-on-click-modal="false">
+    <el-form ref="assessForm" :model="addInfo" :rules="assessRules" 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="assessAnnual">
+            <el-select v-model="addInfo.assessAnnual" clearable placeholder="请选择年份" style="width: 100%">
+              <el-option v-for="item in assessAnnualOpts" :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="annualAssessResult">
+            <el-select v-model="addInfo.annualAssessResult" clearable placeholder="请选择考核结果" style="width: 100%">
+              <el-option v-for="item in assessResultOpts" :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="annualAssessDate">
+            <el-date-picker v-model="addInfo.annualAssessDate" 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.annualAssessIllustration" 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="assessFile"
+              action="action"
+              :file-list="annualAssessFileList"
+              :http-request="uploadAnnualAssessFile"
+              :before-upload="handleBeforeUpload"
+              :on-remove="handleAnnualAssessFileRemove"
+              :on-exceed="annualAssessFileExceed"
+              :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="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">
           保存
@@ -134,16 +82,13 @@
 </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'
+import { assessAdd } from '@/api/supplier/supplier'
+import { Uploadimg } from '@/api/common'
+import { getToday } from '@/utils/dateutils'
+
 export default {
   name: 'AssessDialog',
-  components: { inputVue, dialogHeader, RedStar },
   props: {
     assessAnnualOpts: {
       type: Array,
@@ -151,25 +96,18 @@
         return []
       },
       required: true
+    },
+    assessResultOpts: {
+      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' }
-      ],
+      isShowInfo: false,
       addInfo: {
         supplierCode: '',
         supplierName: '',
@@ -178,83 +116,145 @@
         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
+      assessRules: {
+        assessAnnual: [{ required: true, message: '请选择考核年份', trigger: 'change' }],
+        annualAssessResult: [{ required: true, message: '请选择考核结果', trigger: 'change' }],
+        annualAssessDate: [{ required: true, message: '请选择考核日期', trigger: 'blur' }]
+      },
+      annualAssessFileList: [],
+      assessValid: false
     }
   },
   methods: {
     close() {
-      this.$emit('close')
+      this.isShowInfo = false
+      this.$emit('refreshList')
     },
-    // 照片上传
-    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
+    initDialog(row) {
+      this.isShowInfo = true
+      if (row !== null) {
+        this.addInfo.supplierCode = row.supplierCode
+        this.addInfo.supplierName = row.supplierName
+        this.addInfo.annualAssessDate = getToday('yyyy-MM-dd')
       }
-      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('保存成功')
+      this.validateForm()
+      if (this.assessValid === true) {
+        if (this.annualAssessFileList.length > 0) {
+          for (const i in this.annualAssessFileList) {
+            this.addInfo.annualAssessFile += this.annualAssessFileList[i].url + ','
+          }
+
+          this.addInfo.annualAssessFile = this.addInfo.annualAssessFile.substring(0, this.addInfo.annualAssessFile.length - 1)
+        }
+
+        assessAdd(this.addInfo).then(res => {
+          if (!res.code) {
+            this.$message.success('保存成功')
+            this.clearForm()
+            this.close()
+          }
+        })
+      }
+    },
+    validateForm: function() {
+      this.$refs.assessForm.validate(valid => {
+        this.assessValid = valid
+      })
+    },
+    clearForm() {
+      this.addInfo = {
+        supplierCode: '',
+        supplierName: '',
+        assessAnnual: '',
+        annualAssessResult: '',
+        annualAssessIllustration: '',
+        annualAssessDate: '',
+        annualAssessFile: ''
+      }
+      this.annualAssessFileList = []
+      // 清除验证
+      this.$nextTick(() => {
+        this.$refs.assessForm.clearValidate()
+      })
+    },
+    uploadAnnualAssessFile(file) {
+      // 判断文件是否已经上传过
+      for (const i in this.annualAssessFileList) {
+        if (this.annualAssessFileList[i].name === file.name) {
+          this.$message.error('该文件已上传过，请选择其他文件')
+          this.handleFileNotUploaded(file, this.$refs.assessFile.uploadFiles)
+          return
+        }
+      }
+
+      Uploadimg(file).then(res => {
+        if (res.code === 200) {
+          this.annualAssessFileList.push({
+            name: res.data.fileName,
+            url: res.data.fileId,
+            type: file.file.type
+          })
+          this.$message.success('文件上传成功')
         }
       })
+    },
+    handleAnnualAssessFileRemove(file) {
+      this.handleRemove(file, this.annualAssessFileList)
+    },
+    annualAssessFileExceed(file, fileList) {
+      this.handleExceed(file, this.annualAssessFileList)
+    },
+    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)
+        }
+      }
     }
   }
 }
@@ -266,64 +266,6 @@
   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;
@@ -333,36 +275,9 @@
 
     .save,
     .close {
-      width: 100px;
+      width: 200px;
     }
-
   }
 }
 
-.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 fc318f0..3be46e0 100644
--- a/src/views/supplier/evaluate.vue
+++ b/src/views/supplier/evaluate.vue
@@ -79,10 +79,10 @@
     <history-evaluate-dialog ref="evaluateHis" />
     <evaluate-dialog
       ref="evaluateDialog"
-                     @refreshList="selectData"
-                     :evaluate-annual-opts="evaluateAnnualOpts"
-                     :evaluate-quarterly-opts="evaluateQuarterlyOpts"
-                     :evaluate-result-opts="evaluateResultOpts"
+      @refreshList="selectData"
+      :evaluate-annual-opts="evaluateAnnualOpts"
+      :evaluate-quarterly-opts="evaluateQuarterlyOpts"
+      :evaluate-result-opts="evaluateResultOpts"
     />
   </div>
 </template>
@@ -155,7 +155,6 @@
     },
     getListPage(limit = 10, offset = 1) {
       e_list(`limit=${limit}&offset=${offset}`, this.queryInfo).then(res => {
-        console.log(res)
         this.tableData = res
       })
     },
diff --git a/src/views/supplier/evaluateDialog.vue b/src/views/supplier/evaluateDialog.vue
index 0430118..cba9c96 100644
--- a/src/views/supplier/evaluateDialog.vue
+++ b/src/views/supplier/evaluateDialog.vue
@@ -67,7 +67,7 @@
               accept=".jpg,.jpeg,.png,.pdf,.doc,.docx,.zip,.rar"
             >
               <el-button type="primary" icon="el-icon-upload">
-                上传录库评审结果附件
+                上传季度评价结果附件
               </el-button>
             </el-upload>
           </el-form-item>
@@ -122,15 +122,6 @@
   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: '',
diff --git a/src/views/supplier/historyAssessDialog.vue b/src/views/supplier/historyAssessDialog.vue
index 83694dd..7560e0a 100644
--- a/src/views/supplier/historyAssessDialog.vue
+++ b/src/views/supplier/historyAssessDialog.vue
@@ -1,111 +1,71 @@
 <!--历史考核弹窗-->
 <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>
+  <el-dialog title="年度考核记录" width="60%" :visible.sync="isShowInfo" append-to-body :close-on-click-modal="false">
+    <el-descriptions class="margin-top" title="" :column="2" border style="width: 100%">
+      <el-descriptions-item label="供应商名称" :label-style="labelStyle" :content-style="contentStyle">{{ dataInfo.supplierName }}</el-descriptions-item>
+      <el-descriptions-item label="供应商编号" :label-style="labelStyle">{{ dataInfo.supplierCode }}</el-descriptions-item>
+      <el-descriptions-item label="供应商状态">{{ dataInfo.supplierStatusName }}</el-descriptions-item>
+    </el-descriptions>
+
+    <div style="margin-top: 30px; font-size: 1rem">考核记录</div>
+    <el-table :data="tableData" style="width: 100%" max-height="400px" :highlight-current-row="true">
+      <el-table-column label="序号" width="75">
+        <template scope="scope">
+          <span>{{ scope.$index + 1 }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="assessAnnualName" label="考核年度" width="200"></el-table-column>
+      <el-table-column prop="annualAssessResultName" label="考核结果" width="150"></el-table-column>
+      <el-table-column prop="annualAssessIllustration" label="考核结果说明"></el-table-column>
+      <el-table-column prop="annualAssessDate" label="考核日期" width="150" />
+      <el-table-column label="考核结果附件" width="300">
+        <template slot-scope="scope">
+          <el-link v-for="(item, index) in scope.row.annualAssessFileList" :key="item.id" :href="baseUrl + item" :disabled="item === ''" type="primary" target="_blank" style="margin-right: 10px;">附件{{ index + 1 }}</el-link>
+        </template>
+      </el-table-column>
+    </el-table>
+  </el-dialog>
 </template>
 
 <script>
-import dialogHeader from '../../components/mycomponent/dialog/dialogHeader.vue'
-import inputVue from '../../components/mycomponent/input/inputVue.vue'
-import RedStar from '../../components/mycomponent/redStar.vue'
 
-import { historyAssess } from '../../api/supplier/supplier'
+import { historyAssess } from '@/api/supplier/supplier'
 
 export default {
-  components: { inputVue, dialogHeader, RedStar },
-  props: {
-    dataInfo: {
-      type: Object,
-      dataInfo: {}
-    }
-  },
+  name: 'HistoryAssessDialog',
   data() {
     return {
-      tableData: []
+      isShowInfo: false,
+      tableData: [],
+      dataInfo: {
+
+      },
+      baseUrl: '',
+      labelStyle: {
+        width: '20%'
+      },
+      contentStyle: {
+        width: '30%'
+      }
     }
   },
-  mounted() {
-    this.getHistoryAssess()
-  },
   methods: {
-    // 生成序号
-    indexMethod(index) {
-      return index + 1
+    initHistoryDialog(row) {
+      this.dataInfo = row
+      this.getHistoryAssess(row.supplierCode)
+      this.isShowInfo = true
+      this.baseUrl = this.baseConfig.baseUrl + '/static/'
     },
-    // 合并表头
-    headerStyle({ row, column, rowIndex, columnIndex }) {
-      row[5].colSpan = 2 // 第三列的表头占据2个单元格
-      row[6].colSpan = 0
-      if (columnIndex === 6) {
-        return 'display: none'
-      }
-    },
-    close() {
-      this.$emit('close')
-    },
-    getHistoryAssess() {
-      historyAssess().then(res => {
-        console.log(res)
+    getHistoryAssess(supplierCode) {
+      historyAssess({ supplierCode: supplierCode }).then(res => {
+        res.forEach(record => {
+          if (record.annualAssessDate !== '' && record.annualAssessDate.length > 10) {
+            record.annualAssessDate = record.annualAssessDate.substring(0, 10)
+          }
+          if (record.annualAssessFile !== '') {
+            record.annualAssessFileList = record.annualAssessFile.split(',')
+          }
+        })
         this.tableData = res
       })
     }
@@ -114,33 +74,5 @@
 </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
index e88b88c..dc5ecbc 100644
--- a/src/views/supplier/historyEvaluateDialog.vue
+++ b/src/views/supplier/historyEvaluateDialog.vue
@@ -20,11 +20,11 @@
         </template>
       </el-table-column>
       <el-table-column prop="evaluateQuarterlyName" label="评价结果" width="150"></el-table-column>
-      <el-table-column prop="quarterlyEvaluateIllustration" label="评审结果说明"></el-table-column>
-      <el-table-column prop="quarterlyEvaluateDate" label="评审日期" width="150" />
-      <el-table-column label="评审附件" width="300">
+      <el-table-column prop="quarterlyEvaluateIllustration" label="评价结果说明"></el-table-column>
+      <el-table-column prop="quarterlyEvaluateDate" label="评价日期" width="150" />
+      <el-table-column label="评价结果附件" width="300">
         <template slot-scope="scope">
-          <el-link v-for="(item, index) in scope.row.quarterlyEvaluateFile" :href="baseUrl + item" :disabled="item === ''" type="primary" target="_blank" style="margin-right: 10px;">附件{{ index + 1 }}</el-link>
+          <el-link v-for="(item, index) in scope.row.quarterlyEvaluateFileList" :key="item.id" :href="baseUrl + item" :disabled="item === ''" type="primary" target="_blank" style="margin-right: 10px;">附件{{ index + 1 }}</el-link>
         </template>
       </el-table-column>
     </el-table>
@@ -66,7 +66,7 @@
             record.quarterlyEvaluateDate = record.quarterlyEvaluateDate.substring(0, 10)
           }
           if (record.quarterlyEvaluateFile !== '') {
-            record.quarterlyEvaluateFile = record.quarterlyEvaluateFile.split(',')
+            record.quarterlyEvaluateFileList = record.quarterlyEvaluateFile.split(',')
           }
         })
         this.tableData = res