From d2642474e8756d27a56c6bb5236660eb96487ef9 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 02 Dec 2021 09:53:26 +0800
Subject: [PATCH] 枪支，成绩修改修改
---
src/views/trainExam/performance.vue | 16 +++
src/views/securityEquipment/gun.js | 260 +++++++++++++++++++++++++++-------------------------
2 files changed, 150 insertions(+), 126 deletions(-)
diff --git a/src/views/securityEquipment/gun.js b/src/views/securityEquipment/gun.js
index 8c89ae2..05f4a1e 100644
--- a/src/views/securityEquipment/gun.js
+++ b/src/views/securityEquipment/gun.js
@@ -1,128 +1,138 @@
export var column = [{
- label: "id",
- prop: "id",
- hide: true,
- editDisplay: false,
- addDisplay: false,
- labelWidth: 160,
-},
-// {
-// label: "公务用枪证编号",
-// prop: "gunCardNumber",
-// labelWidth: 160,
-// searchSpan: 4,
-// searchLabelWidth: 130,
-// search: true,
-// rules: [{
-// required: true,
-// message: "请输入公务用枪证编号",
-// trigger: "blur"
-// }]
-// },
-{
- label: "发证企业名称",
- searchLabelWidth: 110,
- labelWidth: 160,
- prop: "issueUnit",
- searchSpan: 4,
- rules: [{
- required: false,
- message: "请输入发证企业名称",
- trigger: "blur"
- }],
- search: true,
-}, //上面不显示
-{
- label: "公务用枪编号",
- prop: "cardNumber",
- labelWidth: 160,
- search: true,
- searchSpan: 4,
- searchLabelWidth: 110,
- rules: [{
- required: true,
- message: "请输入公务用枪编号",
- trigger: "blur"
- }]
- // search: true,
-},
-{
- label: "枪型",
- prop: "gunMode",
- // searchSpan: 4,
- width: 70,
- labelWidth: 160,
- rules: [{
- required: false,
- message: "请输入枪型",
- trigger: "blur"
- }],
- // search: true,
-},
-{
- label: "企业名称",
- prop: "deptId",
- searchSpan: 6,
- searchLabelWidth: 110,
- rules: [{
- required: true,
- message: "请输入企业名称",
- trigger: "blur"
- }],
- hide: true,
- addDisplay: false,
- editDisplay: false,
- search: false,
- overHidden: true,
- dicUrl: "",
- props: {
- label: "title",
- value: "id"
+ label: "id",
+ prop: "id",
+ hide: true,
+ editDisplay: false,
+ addDisplay: false,
+ labelWidth: 160,
},
- type: "tree",
- width: 250,
-},
-{
- label: "责任人",
- prop: "personInCharge",
- labelWidth: 160,
- rules: [{
- required: false,
- message: "请输入责任人",
- trigger: "blur"
- }]
-},
-{
- label: "发证日期",
- labelWidth: 160,
- prop: "issueTime",
- // search: true,
- type: "date",
- format: "yyyy-MM-dd",
- valueFormat: "yyyy-MM-dd",
- // width: 110,
- // overHidden: true,
- // search: true,
- rules: [{
- required: true,
- message: "请输入发证日期",
- trigger: "blur"
- }]
-},
-{
- label: "有效日期",
- prop: "validTime",
- labelWidth: 160,
- // search: true,
- type: "date",
- format: "yyyy-MM-dd",
- valueFormat: "yyyy-MM-dd",
- searchSpan: 4,
- overHidden: true,
- rules: [{
- required: true,
- message: "请输入有效日期",
- trigger: "blur"
- }]
-}
+ // {
+ // label: "公务用枪证编号",
+ // prop: "gunCardNumber",
+ // labelWidth: 160,
+ // searchSpan: 4,
+ // searchLabelWidth: 130,
+ // search: true,
+ // rules: [{
+ // required: true,
+ // message: "请输入公务用枪证编号",
+ // trigger: "blur"
+ // }]
+ // },
+ {
+ label: "发证企业名称",
+ searchLabelWidth: 110,
+ labelWidth: 160,
+ prop: "issueUnit",
+ searchSpan: 4,
+ rules: [{
+ required: false,
+ message: "请输入发证企业名称",
+ trigger: "blur"
+ }],
+ search: true,
+ }, //上面不显示
+ {
+ label: "公务用枪编号",
+ prop: "cardNumber",
+ labelWidth: 160,
+ search: true,
+ searchSpan: 4,
+ searchLabelWidth: 110,
+ rules: [{
+ required: true,
+ message: "请输入公务用枪编号",
+ trigger: "blur"
+ }]
+ // search: true,
+ },
+ {
+ label: "枪型",
+ prop: "gunMode",
+ // searchSpan: 4,
+ width: 70,
+ labelWidth: 160,
+ rules: [{
+ required: false,
+ message: "请输入枪型",
+ trigger: "blur"
+ }],
+ // search: true,
+ },
+ {
+ label: "企业名称",
+ prop: "deptId",
+ searchSpan: 6,
+ searchLabelWidth: 110,
+ rules: [{
+ required: true,
+ message: "请输入企业名称",
+ trigger: "blur"
+ }],
+ hide: true,
+ addDisplay: false,
+ editDisplay: false,
+ search: false,
+ overHidden: true,
+ dicUrl: "",
+ props: {
+ label: "title",
+ value: "id"
+ },
+ type: "tree",
+ width: 250,
+ },
+ {
+ label: "责任人",
+ prop: "personInCharge",
+ labelWidth: 160,
+ rules: [{
+ required: false,
+ message: "请输入责任人",
+ trigger: "blur"
+ }]
+ },
+ {
+ label: "责任人身份证号",
+ prop: "cardNo",
+ labelWidth: 160,
+ rules: [{
+ required: false,
+ message: "请输入责任人身份证号",
+ trigger: "blur"
+ }]
+ },
+ {
+ label: "发证日期",
+ labelWidth: 160,
+ prop: "issueTime",
+ // search: true,
+ type: "date",
+ format: "yyyy-MM-dd",
+ valueFormat: "yyyy-MM-dd",
+ // width: 110,
+ // overHidden: true,
+ // search: true,
+ rules: [{
+ required: true,
+ message: "请输入发证日期",
+ trigger: "blur"
+ }]
+ },
+ {
+ label: "有效日期",
+ prop: "validTime",
+ labelWidth: 160,
+ // search: true,
+ type: "date",
+ format: "yyyy-MM-dd",
+ valueFormat: "yyyy-MM-dd",
+ searchSpan: 4,
+ overHidden: true,
+ rules: [{
+ required: true,
+ message: "请输入有效日期",
+ trigger: "blur"
+ }]
+ }
]
\ No newline at end of file
diff --git a/src/views/trainExam/performance.vue b/src/views/trainExam/performance.vue
index 82b81b6..6cb37be 100644
--- a/src/views/trainExam/performance.vue
+++ b/src/views/trainExam/performance.vue
@@ -294,11 +294,25 @@
callback();
}
};
+ var validatePass2 = (rule, value, callback) => {
+ if (value == undefined || value == "") {
+ callback(new Error("请输入理论成绩"));
+ return;
+ } else if (value !== "" && isNaN(value) == true) {
+ callback(new Error("请输入数字"));
+ } else if (value <= 0) {
+ callback(new Error("分数设置请大于0"));
+ } else if (value > 100) {
+ callback(new Error("分数设置请小于100"));
+ } else {
+ callback();
+ }
+ };
return {
rules: {
editGrades: [
- { validator: validatePass, required: true, trigger: "blur" },
+ { validator: validatePass2, required: true, trigger: "blur" },
],
},
gradeForm: {
--
Gitblit v1.9.3