licailing 5 år sedan
förälder
incheckning
b21d108c5c

+ 3 - 0
src/main/java/com/izouma/wenlvju/dto/RateDTO.java

@@ -53,6 +53,9 @@ public class RateDTO {
     @ApiModelProperty(value = "是否提交")
     @ApiModelProperty(value = "是否提交")
     private boolean submit;
     private boolean submit;
 
 
+    @ApiModelProperty(value = "是否承办考级活动")
+    private boolean undertakeExamination;
+
 //    @ApiModelProperty(value = "承办单位")
 //    @ApiModelProperty(value = "承办单位")
 //    private String organizer;
 //    private String organizer;
 
 

+ 5 - 1
src/main/vue/src/views/rate/RateDistrictList.vue

@@ -261,7 +261,7 @@
                         plain
                         plain
                         size="mini"
                         size="mini"
                         @click="saveComplete(row)"
                         @click="saveComplete(row)"
-                        :loading="loading"
+                        :loading="row.loading"
                         >收取纸质材料</el-button
                         >收取纸质材料</el-button
                     >
                     >
                     <!-- <el-button @click="deleteRow(row)" type="danger" size="mini" plain>删除</el-button> -->
                     <!-- <el-button @click="deleteRow(row)" type="danger" size="mini" plain>删除</el-button> -->
@@ -573,6 +573,8 @@ export default {
             }
             }
         },
         },
         saveDismiss() {
         saveDismiss() {
+            let row = this.form;
+            this.$set(row, 'loading', true);
             this.$http
             this.$http
                 .post('/rate/audit', {
                 .post('/rate/audit', {
                     id: this.form.id,
                     id: this.form.id,
@@ -581,10 +583,12 @@ export default {
                     remark: this.reason
                     remark: this.reason
                 })
                 })
                 .then(res => {
                 .then(res => {
+                    this.$set(row, 'loading', false);
                     this.$message.success('退回成功');
                     this.$message.success('退回成功');
                     this.getData();
                     this.getData();
                 })
                 })
                 .catch(e => {
                 .catch(e => {
+                    this.$set(row, 'loading', false);
                     console.log(e);
                     console.log(e);
                     this.$message.error(e.error);
                     this.$message.error(e.error);
                 });
                 });

+ 4 - 0
src/main/vue/src/views/rate/RateList.vue

@@ -573,6 +573,8 @@ export default {
             this.form = row;
             this.form = row;
         },
         },
         saveDismiss() {
         saveDismiss() {
+            let row = this.form;
+            this.$set(row, 'loading', true);
             this.$http
             this.$http
                 .post('/rate/audit', {
                 .post('/rate/audit', {
                     id: this.form.id,
                     id: this.form.id,
@@ -581,10 +583,12 @@ export default {
                     remark: '复审驳回:' + this.reason
                     remark: '复审驳回:' + this.reason
                 })
                 })
                 .then(res => {
                 .then(res => {
+                    this.$set(row, 'loading', false);
                     this.$message.success('退回成功');
                     this.$message.success('退回成功');
                     this.getData();
                     this.getData();
                 })
                 })
                 .catch(e => {
                 .catch(e => {
+                    this.$set(row, 'loading', false);
                     console.log(e);
                     console.log(e);
                     this.$message.error(e.error);
                     this.$message.error(e.error);
                 });
                 });