diff --git a/src/views/inspection/inspectionPlanDetail.vue b/src/views/inspection/inspectionPlanDetail.vue
index a8578f0..e52e3bf 100644
--- a/src/views/inspection/inspectionPlanDetail.vue
+++ b/src/views/inspection/inspectionPlanDetail.vue
@@ -31,11 +31,24 @@
export default {
name: "inspectionPlanDetail",
data() {
- var validateTime = (rule, value, callback) => {
+ var validateStart = (rule, value, callback) => {
+ if (value === '') {
+ callback(new Error('请输入计划开始时间'));
+ } else if(this.form.endTime !== null && this.form.endTime !== '') {
+ if(value > this.form.endTime) {
+ callback(new Error('输入的计划起始时间大于计划终了时间'));
+ }
+ } else {
+ callback();
+ }
+ };
+ var validateEnd = (rule, value, callback) => {
if (value === '') {
callback(new Error('请输入计划终了时间'));
- } else if(this.form.startTime > value) {
- callback(new Error('输入的计划起始时间大于计划终了时间'));
+ } else if(this.form.startTime !== null && this.form.startTime !== '') {
+ if(this.form.startTime > value) {
+ callback(new Error('输入的计划终了时间小于计划起始时间'));
+ }
} else {
callback();
}
@@ -105,11 +118,7 @@
labelWidth: 120,
format: 'yyyy年MM月dd日',
valueFormat: "yyyyMMdd",
- rules: [{
- required: true,
- message: "请输入计划起始时间",
- trigger: "blur"
- }]
+ rules: [{required: true, validator: validateStart, trigger: 'blur' }]
},
{
label: "计划终了时间",
@@ -119,7 +128,7 @@
labelWidth: 120,
format: 'yyyy年MM月dd日',
valueFormat: "yyyyMMdd",
- rules: [{required: true, validator: validateTime, trigger: 'blur' }]
+ rules: [{required: true, validator: validateEnd, trigger: 'blur' }]
},
{
label: "状态",
diff --git a/src/views/inspection/inspectiontasks.vue b/src/views/inspection/inspectiontasks.vue
index 04fdae2..cff2358 100644
--- a/src/views/inspection/inspectiontasks.vue
+++ b/src/views/inspection/inspectiontasks.vue
@@ -109,6 +109,10 @@
callback(new Error('请输入任务执行开始时间'));
} else if(this.currStartDate > value.replaceAll('/','').slice(0, 8)) {
callback(new Error('输入的任务执行开始时间小于任务开始日期'));
+ }else if(this.resultForm.executeEndDate !== '' && this.resultForm.executeEndDate !== null) {
+ if(this.resultForm.executeEndDate.trim().replaceAll('/','') < value.trim().replaceAll('/','')) {
+ callback(new Error('输入的任务执行开始时间大于任务执行结束时间'));
+ }
} else {
callback();
}
diff --git a/src/views/inspection/inspectiontasksDetail.vue b/src/views/inspection/inspectiontasksDetail.vue
index c3c4970..63769ec 100644
--- a/src/views/inspection/inspectiontasksDetail.vue
+++ b/src/views/inspection/inspectiontasksDetail.vue
@@ -52,7 +52,18 @@ import request from "@/router/axios";
export default {
name: "inspectiontasksDetail",
data () {
- var validateTime = (rule, value, callback) => {
+ var validateStartTime = (rule, value, callback) => {
+ if (value === '') {
+ callback(new Error('请输入任务开始日期'));
+ } else if(this.information_form.taskEndDate !== '' && this.information_form.taskEndDate !== null) {
+ if(this.information_form.taskEndDate < value) {
+ callback(new Error('输入的任务开始日期大于任务完成日期'));
+ }
+ } else {
+ callback();
+ }
+ };
+ var validateEndTime = (rule, value, callback) => {
if (value === '') {
callback(new Error('请输入任务完成日期'));
} else if(this.information_form.taskStartDate > value) {
@@ -132,11 +143,7 @@ export default {
labelWidth: 120,
format: 'yyyy年MM月dd日',
valueFormat: "yyyyMMdd",
- rules: [{
- required: true,
- message: "请输入任务开始日期",
- trigger: "blur"
- }]
+ rules: [{required: true, validator: validateStartTime, trigger: 'blur' }]
},
{
label: "任务完成日期",
@@ -146,7 +153,7 @@ export default {
labelWidth: 120,
format: 'yyyy年MM月dd日',
valueFormat: "yyyyMMdd",
- rules: [{required: true, validator: validateTime, trigger: 'blur' }]
+ rules: [{required: true, validator: validateEndTime, trigger: 'blur' }]
},
{
label: "对象编号",
diff --git a/src/views/leger/equipmentledgerDetail.vue b/src/views/leger/equipmentledgerDetail.vue
index a8f1b9c..983d9b7 100644
--- a/src/views/leger/equipmentledgerDetail.vue
+++ b/src/views/leger/equipmentledgerDetail.vue
@@ -614,6 +614,8 @@
{
label: "页数",
prop: "page",
+ type: 'number',
+ step: 1,
span: 20,
rules: [{
required: true,
diff --git a/src/views/leger/toolinventoryrecordDetail.vue b/src/views/leger/toolinventoryrecordDetail.vue
index fd9ca5b..662882b 100644
--- a/src/views/leger/toolinventoryrecordDetail.vue
+++ b/src/views/leger/toolinventoryrecordDetail.vue
@@ -552,6 +552,8 @@ export default {
label: "页数",
prop: "page",
span: 20,
+ type: 'number',
+ step: 1,
rules: [{
required: true,
message: "请输入页数",
diff --git a/src/views/release/productioninformation.vue b/src/views/release/productioninformation.vue
index cb0ae68..6890535 100644
--- a/src/views/release/productioninformation.vue
+++ b/src/views/release/productioninformation.vue
@@ -31,35 +31,40 @@
新增
发布
停用
批量驳回
批量审核
编辑
+ @click="$refs.crud.rowEdit(row,index)" v-if="permission.productioninformation_edit">修改
删除
- 审核
- 驳回
+ @click="$refs.crud.rowDel(row,index)" v-if="permission.productioninformation_delete">删除
+ 审核
+ 驳回
diff --git a/src/views/smart/operationticket.vue b/src/views/smart/operationticket.vue
index 811af90..6a55c54 100644
--- a/src/views/smart/operationticket.vue
+++ b/src/views/smart/operationticket.vue
@@ -32,29 +32,33 @@
新增
批量驳回
批量审核
导出
- 查看
- 关票
- 删除
+ 查看
+ 关票
+ 删除
新增
@@ -63,27 +64,27 @@
+ v-if="shouldShowButton && permission.operationticket_close">
关票
+ v-if="shouldShowButton && permission.operationticket_audit">
审核
+ v-if="shouldShowButton && permission.operationticket_reject">
驳回
+ v-if="shouldShowButton && permission.operationticket_edit">
修改
+ v-if="shouldShowButton && permission.operationticket_delete">
删除