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

liuyg

2022-03-02 b6d70fd9329b1c5fee415713e7ca5d9dcab66526

 src/views/trainingRegistration/index.vue

@@ -93,6 +93,14 @@
          :type="type"
          >确认报名</el-button
        >
        <el-button
          v-if="row.vipStatus!=1 && permission.trainingRegistration_vip"
          icon="el-icon-folder-checked"
          @click="usesVipConfirm(row)"
          :size="size"
          :type="type"
          >缴费确认</el-button
        >
      </template>
    </avue-crud>

@@ -141,7 +149,8 @@
  update,
  remove,
  cancelTrain,
  addExam
  addExam,
  vipSign
} from "@/api/trainingRegistration/trainingRegistration";
import { mapGetters } from "vuex";
import { getRoleDetail } from "@/api/system/role";
@@ -339,7 +348,7 @@
          }
        },
        labelWidth: "120",
        menuWidth: 200,
        menuWidth: 280,
        align: "center",
        reserveSelection: true,
        selection: true,
@@ -565,6 +574,28 @@
          });
        });
    },
    usesVipConfirm(row){
        this.$confirm("确定将选择当前人员确认已缴费?", {
          confirmButtonText: "确定",
          cancelButtonText: "取消",
          type: "warning"
      })
        .then(() => {
          var data = {
            id : row.id,
            userId:row.userId,
            vipStatus :1
          }
          return vipSign(data);
        })
        .then(() => {
          this.onLoad(this.page);
          this.$message({
            type: "success",
            message: "操作成功!"
          });
        });
    },
    selectionChange(list) {
      // this.selectionList = list;
      this.choiceName = [];
@@ -626,6 +657,10 @@
            //如果是培训公司管理员
            params["trainingUnitId"] = that.userInfo.dept_id;
          }
          if (roleAlias == "公安管理员" || roleAlias == "民警") {
            //如果公安
            params["jurisdiction"] = that.userInfo.jurisdiction;
          }
          // params["isExam"] = 1;
          getdata(
            page.currentPage,