Merge branch 'dev' of http://git.izouma.com/licailing/wenlvju into dev

src/main/java/com/izouma/wenlvju/web/RateController.java

@@ -132,9 +132,10 @@ public class RateController extends BaseController {
     }
 
     @GetMapping("/export/{id}")
-    public void export(HttpServletResponse response, @PathVariable Long id) {
+    public String export(HttpServletResponse response, @PathVariable Long id) {
         Rate rate = rateRepo.findById(id).orElseThrow(new BusinessException("无申请"));
         rateService.export(response, rate);
+        return "ok";
     }
 
     @GetMapping("/saveReviewTime")

src/main/vue/src/views/AssignExpert.vue

@@ -11,7 +11,7 @@
         >
             <el-divider direction="horizontal" content-position="left">基本信息</el-divider>
             <el-form-item label="承办单位名称" prop="name">
-                <el-input v-model="formData.name" placeholder="请输入承办单位名称"></el-input>
+                <el-input v-model="formData.name" placeholder="请输入承办单位名称" readonly></el-input>
             </el-form-item>
             <el-form-item prop="introduction" label="单位概况">
                 <el-input

src/main/vue/src/views/organization/GradeList.vue

@@ -22,7 +22,7 @@
             <el-table-column prop="label" label="二级指标" min-width="35" align="center"> </el-table-column>
             <el-table-column prop="sub" label="评定项目和要求" min-width="120" show-overflow-tooltip> </el-table-column>
             <el-table-column prop="score" label="分值" min-width="20" align="center"> </el-table-column>
-            <el-table-column prop="score" label="评定分" min-width="20" align="center">
+            <el-table-column prop="score" label="参考分" min-width="20" align="center">
                 <template slot-scope="{ row }">
                     {{ getValue(row.value) }}
                 </template>