From 39f6cf663d444830a2ccefee7681e06e0e66e239 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 07 Jan 2022 14:11:22 +0800
Subject: [PATCH] 成绩修改，保安员检查，单位检查导出修改
---
src/api/system/user.js | 8 +
src/views/home/index.vue | 8 +
src/views/qualificationExamination/qualificationExamination.vue | 109 ++++++++++++++++--
src/views/onSiteInspection/company.vue | 27 ---
src/views/onSiteInspection/securityStaff.vue | 26 ---
src/views/qualificationExamination/scoreInquiry.vue | 178 +----------------------------
6 files changed, 130 insertions(+), 226 deletions(-)
diff --git a/src/api/system/user.js b/src/api/system/user.js
index c4c3643..bccfd42 100644
--- a/src/api/system/user.js
+++ b/src/api/system/user.js
@@ -51,6 +51,14 @@
})
}
+export const updateUser = (row) => {
+ return request({
+ url: '/api/blade-user/updateUser',
+ method: 'post',
+ data: row
+ })
+}
+
export const updatePlatform = (userId, userType, userExt) => {
return request({
url: '/api/blade-user/update-platform',
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index 7f96ded..cc22090 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -476,6 +476,14 @@
width="150"
></el-table-column>
<el-table-column
+ v-if="gridData.type === 'zg'"
+ :key="gridData.type"
+ prop="emails"
+ label="审查异常备注"
+ :show-overflow-tooltip="true"
+ width="150"
+ ></el-table-column>
+ <el-table-column
v-if="gridData.type === 'xs'"
:key="gridData.type"
prop="score"
diff --git a/src/views/onSiteInspection/company.vue b/src/views/onSiteInspection/company.vue
index 76ea045..f1b4f07 100644
--- a/src/views/onSiteInspection/company.vue
+++ b/src/views/onSiteInspection/company.vue
@@ -50,8 +50,7 @@
remove,
} from "@/api/onSiteInspection/company";
import { mapGetters } from "vuex";
-// import { datasing } from "@api/qualificationExamination/datasignQualificationExamination";
-import { datasing } from "./company";
+import { getToken } from "@/util/auth";
import Qs from "qs";
export default {
@@ -227,29 +226,11 @@
jurisdiction: this.userInfo.jurisdiction,
};
//导出
- // if (
- // this.userInfo.role_name == "保安公司管理员" ||
- // this.userInfo.role_name == "保安"
- // ) {
- // //如果是保安公司管理员
- // data["deptId"] = this.userInfo.dept_id;
- // }
- // if (this.userInfo.role_name == "培训公司管理员") {
- // //如果是培训公司管理员
- // data["trainUnitId"] = this.userInfo.dept_id;
- // }
- // data["examType"] = 2;
//序列号url形式，用&拼接
data = Qs.stringify(data);
- window.open(`/api/coinspect/export-coinspect?` + data);
- })
- .catch((action) => {
- // this.$message({
- // type: 'info',
- // message: action === 'cancel'
- // ? '放弃保存并离开页面'
- // : '停留在当前页面'
- // })
+ window.open(`/api/coinspect/export-coinspect?${
+ this.website.tokenHeader
+ }=${getToken()}&` + data);
});
},
getStartTime() {
diff --git a/src/views/onSiteInspection/securityStaff.vue b/src/views/onSiteInspection/securityStaff.vue
index a3d5986..63e84c6 100644
--- a/src/views/onSiteInspection/securityStaff.vue
+++ b/src/views/onSiteInspection/securityStaff.vue
@@ -50,7 +50,7 @@
remove,
} from "@/api/onSiteInspection/securityStaff";
import { mapGetters } from "vuex";
-import { datasing } from "./securityStaffdata";
+import { getToken } from "@/util/auth";
import Qs from "qs";
export default {
@@ -336,30 +336,12 @@
jurisdiction: this.userInfo.jurisdiction,
};
//导出
- // if (
- // this.userInfo.role_name == "保安公司管理员" ||
- // this.userInfo.role_name == "保安"
- // ) {
- // //如果是保安公司管理员
- // data["deptId"] = this.userInfo.dept_id;
- // }
- // if (this.userInfo.role_name == "培训公司管理员") {
- // //如果是培训公司管理员
- // data["trainUnitId"] = this.userInfo.dept_id;
- // }
- // data["examType"] = 2;
//序列号url形式，用&拼接
data = Qs.stringify(data);
- window.open(`/api/seinspect/export-seinspect?` + data);
+ window.open(`/api/seinspect/export-seinspect?${
+ this.website.tokenHeader
+ }=${getToken()}&` + data);
})
- .catch((action) => {
- // this.$message({
- // type: 'info',
- // message: action === 'cancel'
- // ? '放弃保存并离开页面'
- // : '停留在当前页面'
- // })
- });
},
getStartTime() {
if (
diff --git a/src/views/qualificationExamination/qualificationExamination.vue b/src/views/qualificationExamination/qualificationExamination.vue
index 8beb705..8f909f5 100644
--- a/src/views/qualificationExamination/qualificationExamination.vue
+++ b/src/views/qualificationExamination/qualificationExamination.vue
@@ -39,13 +39,39 @@
>导出
</el-button>
</template>
+ <template slot-scope="{ type, size, row }" slot="menu">
+ <el-button
+ :type="type"
+ :size="size"
+ icon="el-icon-edit"
+ :disabled="row.examinationType!=1"
+ @click="handleAuditDesc(row)"
+ >审查异常备注
+ </el-button>
+ </template>
</avue-crud>
+
+ <el-dialog
+ title="审查异常备注"
+ append-to-body
+ :visible.sync="dialogAudit"
+ width="900px"
+ @close="closeDialog"
+ >
+ <avue-form
+ ref="formAudit"
+ v-model="audit"
+ :option="optionAuditDesc"
+ @reset-change="emptytChange"
+ @submit="submitAudit"
+ ></avue-form>
+ </el-dialog>
</basic-container>
</template>
<script>
import { mapGetters } from "vuex";
-import { getListSecurity } from "@/api/system/user";
+import { getListSecurity,updateUser } from "@/api/system/user";
import Qs from "qs";
import { getToken } from "@/util/auth";
export default {
@@ -61,6 +87,34 @@
currentPage: 1,
total: 0,
},
+ id:"",
+ batchAudit: {},
+ dialogAudit: false,
+ optionAuditDesc: {
+ height: "auto",
+ filterBtn: true,
+ calcHeight: 30,
+ dialogWidth: 950,
+ tip: false,
+ searchShow: true,
+ searchMenuSpan: 6,
+ border: true, //liu
+ index: true,
+ stripe: true,
+ viewBtn: true,
+ selection: false,
+ excelBtn: false,
+ menuWidth: 380,
+ dialogClickModal: false,
+ column: [
+ {
+ label: "审核明细",
+ span: 24,
+ type: "textarea",
+ prop: "emails",
+ },
+ ],
+ },
selectionList: [],
option: {
// 操作栏多余按钮去除
@@ -68,7 +122,8 @@
editBtn: false,
addBtn: false,
selection: true,
- menu: false,
+ menu: true,
+ menuWidth:150,
searchShowBtn: false,
align: "center",
height: "auto",
@@ -201,12 +256,10 @@
prop: "auditTime",
// hide: true,
},
- // {
- // label: "是否在职",
- // prop: "status",
- // // labelWidth: 120,
- // // display: false,
- // },
+ {
+ label: "审查异常备注",
+ prop: "emails",
+ },
],
},
data: [
@@ -217,10 +270,10 @@
...mapGetters(["permission", "userInfo"]),
permissionList() {
return {
- addBtn: this.vaildData(this.permission.post_add, false),
- viewBtn: this.vaildData(this.permission.post_view, false),
- delBtn: this.vaildData(this.permission.post_delete, false),
- editBtn: this.vaildData(this.permission.post_edit, false),
+ addBtn: this.vaildData(null, false),
+ viewBtn: this.vaildData(null, false),
+ delBtn: this.vaildData(null, false),
+ editBtn: this.vaildData(null, false),
};
},
ids() {
@@ -235,6 +288,38 @@
this.search["examinationType"] = "1";
},
methods: {
+ //证书批量审核
+ handleAuditDesc(row) {
+ console.log(row,123);
+ this.id = row.id;
+
+ this.dialogAudit = true;
+ },
+ //审查异常备注提交
+ submitAudit(row, done, loading) {
+ var that = this;
+ const data = {
+ id: this.id,
+ emails: row.emails
+ };
+ //提交申请
+ updateUser(data).then(
+ () => {
+ this.onLoad(this.page);
+ that.$refs.formAudit.resetFields();
+ that.dialogAudit = false;
+ this.$message({
+ type: "success",
+ message: "操作成功",
+ });
+ done();
+ },
+ (error) => {
+ window.console.log(error);
+ loading();
+ }
+ );
+ },
//导出
handleExport() {
this.$confirm("是否导出审查信息?", "提示", {
diff --git a/src/views/qualificationExamination/scoreInquiry.vue b/src/views/qualificationExamination/scoreInquiry.vue
index 04216f4..031172d 100644
--- a/src/views/qualificationExamination/scoreInquiry.vue
+++ b/src/views/qualificationExamination/scoreInquiry.vue
@@ -51,10 +51,9 @@
// remove,
// } from "@/api/regulatoryInformation/regulatoryInformation";
import { mapGetters } from "vuex";
-import { datasing } from "./dataqualificationExamination";
-// import { getList } from "@/api/qualificationExamination/qualificationExamination";
-import { getLisperexamScore } from "@/api/qualificationExamination/scoreInquiry";
import Qs from "qs";
+import { getToken } from "@/util/auth";
+import { getLisperexamScore } from "@/api/qualificationExamination/scoreInquiry";
export default {
data() {
return {
@@ -97,8 +96,7 @@
prop: "examName",
search: true,
searchSpan: 5,
- // slot: true,
- // display: false,
+ minWidth: 150,
},
{
// label: "考试开始时间",
@@ -117,11 +115,6 @@
trigger: "click",
},
],
- // slot: true,
- // display: false,
- // formatter: function (row, value) {
- // return (value = value + "%");
- // },
},
// {
// label: "考试结束时间",
@@ -145,12 +138,6 @@
// // formatter: function (row, value) {
// // return (value = value + "万元");
// // },
- // },
- // {
- // label: "考试类型",
- // prop: "examinationaddress",
- // // slot: true,
- // // display: false,
// },
{
label: "理论成绩",
@@ -217,8 +204,6 @@
value: 3,
},
],
- // slot: true,
- // display: false,
},
{
label: "是否发证",
@@ -226,16 +211,7 @@
},
],
},
- data: [
- // {
- // deptid: "江西众泰保安公司",
- // punishtype: 2,
- // punishreason: "非法施工",
- // punishresult: "没收全部非法所得财产，并罚款3W元",
- // punishtime: "2021-01-01",
- // punisnum: 110110110120,
- // },
- ],
+ data: [],
};
},
computed: {
@@ -266,9 +242,6 @@
})
.then(() => {
//获取查询条件
- // console.log(this.userInfo, 456);
- // console.log(this.query, 456);
- // return;
var data = {
startTime: this.query.startTime,
endTime: this.query.endTime,
@@ -278,30 +251,14 @@
jurisdiction: this.userInfo.jurisdiction,
};
//导出
- // if (
- // this.userInfo.role_name == "保安公司管理员" ||
- // this.userInfo.role_name == "保安"
- // ) {
- // //如果是保安公司管理员
- // data["deptId"] = this.userInfo.dept_id;
- // }
- // if (this.userInfo.role_name == "培训公司管理员") {
- // //如果是培训公司管理员
- // data["trainUnitId"] = this.userInfo.dept_id;
- // }
- // data["examType"] = 2;
//序列号url形式，用&拼接
data = Qs.stringify(data);
- window.open(`/api/examScore/export-examScore?` + data);
+ window.open(
+ `/api/examScore/export-examScore?${
+ this.website.tokenHeader
+ }=${getToken()}&` + data
+ );
})
- .catch((action) => {
- // this.$message({
- // type: 'info',
- // message: action === 'cancel'
- // ? '放弃保存并离开页面'
- // : '停留在当前页面'
- // })
- });
},
getStartTime() {
if (
@@ -323,65 +280,6 @@
}
return "";
},
-
- rowSave(row, done, loading) {
- adddata(row).then(
- () => {
- this.onLoad(this.page);
- this.$message({
- type: "success",
- message: "操作成功!",
- });
- done();
- },
- (error) => {
- window.console.log(error);
- loading();
- }
- );
- },
- rowUpdates(row, index, done, loading) {
- // console.log(42342);
- update(row).then(
- () => {
- this.onLoad(this.page);
- this.$message({
- type: "success",
- message: "操作成功!",
- });
- done();
- },
- (error) => {
- window.console.log(error);
- loading();
- }
- );
- },
- rowDel(row) {
- this.$confirm("确定将选择数据删除?", {
- confirmButtonText: "确定",
- cancelButtonText: "取消",
- type: "warning",
- })
- .then(() => {
- return remove(row.id);
- })
- .then(() => {
- this.onLoad(this.page);
- this.$message({
- type: "success",
- message: "操作成功!",
- });
- });
- },
- // beforeOpen(done, type) {
- // if (["edit", "view"].includes(type)) {
- // getDetail(this.form.id).then((res) => {
- // this.form = res.data.data;
- // });
- // }
- // done();
- // },
searchReset() {
this.query = {};
this.onLoad(this.page);
@@ -411,7 +309,6 @@
this.onLoad(this.page, this.query);
},
onLoad(page, params = {}) {
- // this.loading = false;
this.loading = true;
getLisperexamScore(
page.currentPage,
@@ -434,65 +331,8 @@
}
}
this.loading = false;
- // for (var k in d) {
- // if (d[k].qualified == 0) {
- // d[k].qualified = "通过";
- // } else if (d[k].qualified == 1) {
- // d[k].qualified = "不通过";
- // } else if (d[k].qualified == 2) {
- // d[k].qualified = "暂未录入实操成绩";
- // }
- // }
- // this.data = d;
- // console.log(this.data);
-
- // this.selectionClear();
});
},
- // onLoad(page, params = {}) {
- // // this.loading = false;
- // this.loading = true;
- // // getListJSON().then((res) => {
- // // axios
- // // .get(
- // // "../../api/qualificationExamination/signQualificationExamination.json"
- // // )
- // // .then((res) => {
- // // page.currentPage,
- // // page.pageSize,
- // // Object.assign(params, this.query)
- // if (datasing) {
- // var res = datasing;
- // console.log(res, "signQualificationExamination");
- // const data = res.data;
- // // this.page.total = data.total;
- // var d = data.records;
- // for (var k in d) {
- // d[k].examination_mx = "正常";
- // d[k].examination_type = "正常";
- // d[k]["carid"] = "370111198807051124";
- // d[k]["certificate"] = "拥有";
- // d[k]["reviewTime"] = "2021-02-21";
- // d[k]["results"] = "通过";
- // d[k]["onjob"] = "是";
- // }
- // this.data = d;
- // this.loading = false;
- // }
- // // this.selectionClear();
- // // });
- // },
-
- // 行单击
- // handleRowClick(row) {
- // // delete (row["name"]);
- // var obj = row;
- // obj["name"] = "保安公司详细资料";
- // this.$router.push({
- // path: `/securityCompany/index`,
- // query: obj,
- // });
- // },
},
};
</script>
--
Gitblit v1.9.3