Merge branch 'master' of http://192.168.0.105:10010/r/zhba_enterprises

liuyg

2021-09-27 f3038f41bf703421d0b2d00b082dad11cc5b6c5a

Merge branch 'master' of http://192.168.0.105:10010/r/zhba_enterprises

 src/views/trainExam/singleperformance.vue

@@ -32,10 +32,10 @@
              {{ row.learnGrade == -1 ? "暂未录入" : row.learnGrade }}
            </template>
            <template slot-scope="{ row }" slot="theoryGrade">
              {{ row.learnGrade == -1 ? "" : row.theoryGrade }}
              {{ row.theoryGrade == -1 ? "" : row.theoryGrade }}
            </template>
            <template slot-scope="{ row }" slot="allGrade">
              {{ row.learnGrade == -1 ? "" : row.allGrade }}
              {{ row.allGrade == -1 ? "" : row.allGrade }}
            </template>
            <template slot-scope="{ row }" slot="qualified">
              {{ row.qualified == -1 ? "" : row.qualified==0?"合格":row.qualified==1?"不合格":row.qualified==3?"缺考,成绩无效":'' }}

 src/views/traincompany/index.vue

@@ -79,7 +79,9 @@
    return {
      form: {},
      auditStatus:false,
      formTrainApply: {},
      formTrainApply: {
        num:0
      },
      query: {},
      deptId:null,
      loading: true,
@@ -222,11 +224,23 @@
            ],
            span: 24,
          },
          {
            label: "总数",
            prop: "num",
            disabled:true,
            span: 12,
          },

        ],
      },
      data: [],
    };
  },
  watch: {
    "formTrainApply.userId"() {
      //  console.log(this.formTrainApply.userId.length,456);
       this.formTrainApply.num = this.formTrainApply.userId.length;
    },
  },
  computed: {
    ...mapGetters(["permission"]),
@@ -268,7 +282,7 @@
          if(status=='1'){
            that.auditStatus = true;
          }
          console.log(that.auditStatus,3333);
          // console.log(that.auditStatus,3333);
      })
    },
    //保安公司批量报名