{
- // return this.permission['inspectionroute_col_' + v.prop]
+ // return this.permission['inspectionobject_col_' + v.prop]
// })
return {
addBtn: false,
diff --git a/src/views/inspection/inspectionobjectDetail.vue b/src/views/inspection/inspectionobjectDetail.vue
index ff481a4..3a63578 100644
--- a/src/views/inspection/inspectionobjectDetail.vue
+++ b/src/views/inspection/inspectionobjectDetail.vue
@@ -9,14 +9,14 @@
+ v-if="addUpdateShowButton && permission.inspectionobject_add">
确定
+ v-if="shouldShowButton && permission.inspectionobject_edit">
修改
@@ -30,7 +30,7 @@ import {getToken} from "@/util/auth";
import request from "@/router/axios";
export default {
- name: "inspectionrouteDetail",
+ name: "inspectionobjectDetail",
data() {
return {
addUpdateShowButton:{},
@@ -233,7 +233,7 @@ export default {
...mapGetters(["permission"]),
permissionList() {
// this.option.column = this.option.column.filter(v => {
- // return this.permission['inspectionroute_col_' + v.prop]
+ // return this.permission['inspectionobject_col_' + v.prop]
// })
return {
addBtn: false,
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/equipmentledger.vue b/src/views/leger/equipmentledger.vue
index 5aef489..9a955d5 100644
--- a/src/views/leger/equipmentledger.vue
+++ b/src/views/leger/equipmentledger.vue
@@ -32,27 +32,31 @@
新增
批量审核
批量驳回
导出
- 查看详情
- 删除
+ 查看详情
+ 删除
diff --git a/src/views/leger/equipmentledgerDetail.vue b/src/views/leger/equipmentledgerDetail.vue
index 7ab5584..983d9b7 100644
--- a/src/views/leger/equipmentledgerDetail.vue
+++ b/src/views/leger/equipmentledgerDetail.vue
@@ -75,32 +75,32 @@
+ v-if="addUpdateShowButton && permission.equipmentledger_add">
确定
+ v-if="addUpdateShowButton ">
取消
+ v-if="shouldShowButton && permission.equipmentledger_audit">
审核
+ v-if="shouldShowButton && permission.equipmentledger_reject">
驳回
+ v-if="UpdateShowButton && permission.equipmentledger_edit">
修改
+ v-if="shouldShowButton && permission.equipmentledger_delete">
删除
diff --git a/src/views/leger/toolinventoryrecord.vue b/src/views/leger/toolinventoryrecord.vue
index 78d9cd6..ce9667e 100644
--- a/src/views/leger/toolinventoryrecord.vue
+++ b/src/views/leger/toolinventoryrecord.vue
@@ -31,27 +31,31 @@
新增
批量审核
批量驳回
导出
+ v-if="permission.toolinventoryrecord_export"
+ @click="handleExport()">导出
- 查看
- 删除
+ 查看详情
+ 删除
diff --git a/src/views/leger/toolinventoryrecordDetail.vue b/src/views/leger/toolinventoryrecordDetail.vue
index 460e0d1..662882b 100644
--- a/src/views/leger/toolinventoryrecordDetail.vue
+++ b/src/views/leger/toolinventoryrecordDetail.vue
@@ -100,35 +100,35 @@
+
+ 确定
+ v-if="addUpdateShowButton ">
取消
-
- 确定
+ v-if="shouldShowButton && permission.toolinventoryrecord_audit">
审核
+ v-if="shouldShowButton && permission.toolinventoryrecord_reject">
驳回
+ v-if="UpdateShowButton && permission.toolinventoryrecord_edit">
修改
+ v-if="shouldShowButton && permission.toolinventoryrecord_delete">
删除
@@ -173,7 +173,7 @@ import {readonly} from "vue";
import {getToken} from "@/util/auth";
import {getListByTaskNo} from "@/api/inspection/inspectionresult";
export default {
- name: "equipmentledgerDetail",
+ name: "toolinventoryrecordDetail",
data () {
return {
checkStatusValue:{},
diff --git a/src/views/smart/workpermit.vue b/src/views/smart/workpermit.vue
index 9cf6a97..945cb31 100644
--- a/src/views/smart/workpermit.vue
+++ b/src/views/smart/workpermit.vue
@@ -23,7 +23,7 @@
size="small"
icon="el-icon-delete"
plain
- v-if="permission.equipmentledger_delete"
+ v-if="permission.workpermit_delete"
@click="handleDelete">批量删除
@@ -31,28 +31,32 @@
新增
批量审核
批量驳回
导出
- 查看详情
- 关票
- 删除
+ 查看详情
+ 关票
+ 删除
+ v-if="addUpdateShowButton && permission.workpermit_add">
确定
+ v-if="shouldShowButton && permission.workpermit_close">
关票
+ v-if="shouldShowButton && permission.workpermit_audit">
审核
+ v-if="shouldShowButton && permission.workpermit_reject">
驳回
+ v-if="UpdateShowButton && permission.workpermit_edit">
修改
+ v-if="shouldShowButton && permission.workorder_delete">
删除