冲突

liuyg

2021-08-19 cb81eef3d9aabe280e506fc7971c539542cf13f7

 src/views/companyApply/index.vue

@@ -53,7 +53,7 @@
                :type="type"
                size="small"
                icon="el-icon-folder-checked"
                v-if="row.isApply == 2 || row.isApply == -1"
                v-if="row.isApply == 2 || row.isApply == -1 || row.isApply == 3"
                @click="questionBankRowSave(row)"
                >报名
              </el-button>
@@ -124,6 +124,10 @@
    {
      label: "已取消",
      value: 2,
    },
    {
      label: "考试结束",
      value: 3,
    },
  ],
};
@@ -379,8 +383,8 @@
                value: 2,
              },
              {
                label: "",
                value: -1,
                label: "考试结束",
                value: 3,
              },
            ],
            dataType: "number",