From ed126782bcebb26cb170e3357bd39b11affb4e1f Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 09 Sep 2021 14:09:02 +0800
Subject: [PATCH] 缴费，成绩，派遣记录，派遣单位修改
---
src/views/securityGuardManagement/dispatchChildoperable.vue | 6 +-
src/views/qualificationExamination/paymentInquiry.vue | 4 +-
src/views/securityCompany/dispatch.vue | 4 +-
src/views/qualificationExamination/scoreInquiry.vue | 56 ++++++++++++++++++----------
4 files changed, 43 insertions(+), 27 deletions(-)
diff --git a/src/views/qualificationExamination/paymentInquiry.vue b/src/views/qualificationExamination/paymentInquiry.vue
index fab2b04..1f4784e 100644
--- a/src/views/qualificationExamination/paymentInquiry.vue
+++ b/src/views/qualificationExamination/paymentInquiry.vue
@@ -196,8 +196,8 @@
{
label: "缴费人",
prop: "deptName",
- searchSpan: 4,
- search: true,
+ // searchSpan: 4,
+ // search: true,
// slot: true,
// display: false,
},
diff --git a/src/views/qualificationExamination/scoreInquiry.vue b/src/views/qualificationExamination/scoreInquiry.vue
index ca61b96..c233482 100644
--- a/src/views/qualificationExamination/scoreInquiry.vue
+++ b/src/views/qualificationExamination/scoreInquiry.vue
@@ -62,9 +62,7 @@
addBtn: false,
selection: true,
menu: false,
-
searchShowBtn: false,
-
align: "center",
height: "auto",
calcHeight: 30,
@@ -79,12 +77,14 @@
{
label: "姓名",
prop: "securityName",
- // slot: true,
- // display: false,
+ searchSpan: 4,
+ search: true,
},
{
label: "考试名称",
prop: "examName",
+ search:true,
+ searchSpan:6,
// slot: true,
// display: false,
},
@@ -96,8 +96,7 @@
format: "yyyy-MM-dd",
valueFormat: "yyyy-MM-dd",
labelWidth: 120,
- searchSpan: 4,
- search: true,
+
overHidden: true,
rules: [
{
@@ -160,8 +159,25 @@
// display: false,
},
{
- label: "是否通过",
+ label: "是否合格",
prop: "qualified",
+ searchSpan: 4,
+ search: true,
+ type:"select",
+ dicData:[
+ {
+ label:"合格",
+ value: 0
+ },
+ {
+ label:"不合格",
+ value: 1
+ },
+ {
+ label:"实操成绩暂未录入",
+ value: 3
+ },
+ ]
// slot: true,
// display: false,
},
@@ -292,20 +308,20 @@
).then((res) => {
const data = res.data.data;
this.page.total = data.total;
- var d = data.records;
-
- 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.data = data.records;
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();
});
},
diff --git a/src/views/securityCompany/dispatch.vue b/src/views/securityCompany/dispatch.vue
index 105dbe2..6d7f22d 100644
--- a/src/views/securityCompany/dispatch.vue
+++ b/src/views/securityCompany/dispatch.vue
@@ -88,6 +88,8 @@
prop: "linkman",
display: false,
width: 120,
+ search: true,
+ searchSpan: 4,
},
{
@@ -106,8 +108,6 @@
type: "datetime",
format: "yyyy-MM-dd",
},
- search: true,
- searchSpan: 4,
display: false,
width: 180,
},
diff --git a/src/views/securityGuardManagement/dispatchChildoperable.vue b/src/views/securityGuardManagement/dispatchChildoperable.vue
index 98cb4e4..dfa2ab1 100644
--- a/src/views/securityGuardManagement/dispatchChildoperable.vue
+++ b/src/views/securityGuardManagement/dispatchChildoperable.vue
@@ -143,7 +143,7 @@
},
search: true,
overHidden: true,
- type: "select",
+ type: "tree",
rules: [
{
required: true,
@@ -183,7 +183,7 @@
},
{
label: "保安人名称",
- prop: "name",
+ prop: "securityName",
search: true,
searchSpan: 4,
labelWidth: 120,
@@ -199,7 +199,7 @@
},
{
label: "身份证",
- prop: "cardid",
+ prop: "idCardNo",
labelWidth: 120,
overHidden: true,
rules: [
--
Gitblit v1.9.3