licailing 5 gadi atpakaļ
vecāks
revīzija
77482bfe41

+ 1 - 0
src/main/java/com/izouma/wenlvju/web/RateController.java

@@ -47,6 +47,7 @@ public class RateController extends BaseController {
             Rate orig = rateRepo.findById(record.getId()).orElseThrow(new BusinessException("无记录"));
             Rate orig = rateRepo.findById(record.getId()).orElseThrow(new BusinessException("无记录"));
             if (RateStatus.SUBMIT_GRADE.equals(record.getStatus())) {
             if (RateStatus.SUBMIT_GRADE.equals(record.getStatus())) {
                 record.setUndertakeExamination(orig.isUndertakeExamination());
                 record.setUndertakeExamination(orig.isUndertakeExamination());
+                record.setRateAudits(orig.getRateAudits());
             }
             }
             ObjUtils.merge(orig, record);
             ObjUtils.merge(orig, record);
             return rateRepo.save(orig);
             return rateRepo.save(orig);

+ 0 - 2
src/main/vue/src/views/AssignExpert.vue

@@ -141,7 +141,6 @@ export default {
                                     value: item.id
                                     value: item.id
                                 });
                                 });
                             });
                             });
-                            console.log(this.expert);
                             this.getEmp(res);
                             this.getEmp(res);
                         });
                         });
                     this.$http
                     this.$http
@@ -266,7 +265,6 @@ export default {
                             return item.id === data[index];
                             return item.id === data[index];
                         })
                         })
                     );
                     );
-                    console.log(this.emps);
                 }
                 }
                 this.employeeIds = data;
                 this.employeeIds = data;
             }
             }

+ 1 - 0
src/main/vue/src/views/RateAudit.vue

@@ -227,6 +227,7 @@ export default {
                 .then(res => {
                 .then(res => {
                     this.formData = res;
                     this.formData = res;
                     let data = res.rateAudits;
                     let data = res.rateAudits;
+                    console.log(data);
                     if (typeof data != 'undefined') {
                     if (typeof data != 'undefined') {
                         this.showAudit = true;
                         this.showAudit = true;
                         this.rateAudits = data;
                         this.rateAudits = data;

+ 2 - 2
src/main/vue/src/views/organization/GradeList.vue

@@ -147,12 +147,12 @@ export default {
                         this.rateList = res.content;
                         this.rateList = res.content;
 
 
                         let form = {};
                         let form = {};
-                        console.log(this.categories);
+                        // console.log(this.categories);
 
 
                         [...this.categories].forEach(item => {
                         [...this.categories].forEach(item => {
                             form[item.value] = this.getValue(item.value);
                             form[item.value] = this.getValue(item.value);
                         });
                         });
-                        console.log(form);
+                        // console.log(form);
 
 
                         this.form = form;
                         this.form = form;
                     }
                     }