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

liuyg

2021-09-27 788edd22eb874af43c3dadcafa4bf158a2513485

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

 src/views/securityGuard/securityGuard.vue

@@ -405,7 +405,6 @@
          },
        ],
      },

      form: {},
      search: {},
      roleBox: false,

 src/views/system/user.vue

@@ -1083,7 +1083,7 @@
      if (this.userInfo.role_name == "公安管理员") {
        params["jurisdiction"] = this.userInfo.jurisdiction;
      }

      params['status'] = 1;
      getList(
        page.currentPage,
        page.pageSize,

 src/views/trainApply/index.vue

@@ -70,7 +70,7 @@
                            :type="type"
                            size="small"
                            icon="el-icon-refresh-left"
                            :disabled="row.cancel==2"
                            :disabled="row.cancel==2  || row.isExam==2  || row.isExam==3"
                            @click="revoke(row)"
                            >取消报名
                            </el-button>

 src/views/trainingRegistration/index.vue

@@ -181,7 +181,7 @@
          {
            label: "序号开始",
            prop: "serialStart",
            span: 6,
            span: 12,
            value:1,
            mock:{
              type:'number',
@@ -203,7 +203,7 @@
          {
            label: "序号结束",
            prop: "serialEnd",
            span: 6,
            span: 12,
            value:50,
            mock:{
              type:'number',
@@ -541,6 +541,7 @@
              //如果是培训公司管理员
              params["trainingUnitId"] = that.userInfo.dept_id;
            }
            params['isExam'] = 1;
            getdata(
              page.currentPage,
              page.pageSize,