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/inspectionobject.vue b/src/views/inspection/inspectionobject.vue index 994d6a1..22a2d9f 100644 --- a/src/views/inspection/inspectionobject.vue +++ b/src/views/inspection/inspectionobject.vue @@ -24,36 +24,39 @@ size="small" icon="el-icon-delete" plain - v-if="permission.inspectionroute_delete" + v-if="permission.inspectionobject_delete" @click="handleDelete">批量删除 { - // 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..ddebc78 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(); } @@ -559,26 +563,33 @@ return; } this.stopBox = true; + this.$refs.stopForm.resetForm(); }, submitStop(){ - this.$confirm("是否将选择巡检任务停止?", { - confirmButtonText: "确定", - cancelButtonText: "取消", - type: "warning" + this.$refs.stopForm.validate((valid, done, msg) => { + if (valid) { + done() + this.$confirm("是否将选择巡检任务停止?", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning" + }) + .then(() => { + return stop(this.ids, this.stopForm.cancelReason); + }) + .then(() => { + this.$refs.stopForm.resetForm(); + this.stopBox = false; + this.onLoad(this.page); + this.$message({ + type: "success", + message: "操作成功!" + }); + this.$refs.crud.toggleSelection(); + }); + } }) - .then(() => { - return stop(this.ids, this.stopForm.cancelReason); - }) - .then(() => { - this.stopForm.cancelReason = ''; - this.stopBox = false; - this.onLoad(this.page); - this.$message({ - type: "success", - message: "操作成功!" - }); - this.$refs.crud.toggleSelection(); - }); + }, handleExport() { this.$confirm("是否导出数据?", "提示", { 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 b0b880c..4c4bbcf 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"> 删除 @@ -128,6 +128,18 @@ export default { name: "equipmentledgerDetail", data () { + var validatePage = (rule, value, callback) => { + if (value === '') { + callback(new Error('请输入页数')); + } else { + var r = /^\+?[0-9][0-9]*$/; + if(!r.test(value)) { + callback(new Error('输入的页数不合法')); + } else { + callback(); + } + } + }; return { checkStatusValue: this.$route.query.checkstatus, optionCheckStatus: [{ @@ -615,11 +627,7 @@ label: "页数", prop: "page", span: 20, - rules: [{ - required: true, - message: "请输入页数", - trigger: "blur" - }], + rules: [{required: true, validator: validatePage, trigger: 'blur' }] }, { label: "关键字", 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 22e5151..566bac3 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,8 +173,20 @@ import {readonly} from "vue"; import {getToken} from "@/util/auth"; import {getListByTaskNo} from "@/api/inspection/inspectionresult"; export default { - name: "equipmentledgerDetail", + name: "toolinventoryrecordDetail", data () { + var validatePage = (rule, value, callback) => { + if (value === '') { + callback(new Error('请输入页数')); + } else { + var r = /^\+?[0-9][0-9]*$/; + if(!r.test(value)) { + callback(new Error('输入的页数不合法')); + } else { + callback(); + } + } + }; return { checkStatusValue:{}, optionCheckStatus: [{ @@ -552,11 +564,7 @@ export default { label: "页数", prop: "page", span: 20, - rules: [{ - required: true, - message: "请输入页数", - trigger: "blur" - }], + rules: [{required: true, validator: validatePage, trigger: 'blur' }] }, { label: "关键字", 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 @@ 新增 发布 停用 批量驳回 批量审核 diff --git a/src/views/smart/operationticket.vue b/src/views/smart/operationticket.vue index 811af90..6e4bc31 100644 --- a/src/views/smart/operationticket.vue +++ b/src/views/smart/operationticket.vue @@ -32,29 +32,33 @@ 新增 批量驳回 批量审核 导出 取消 + size="small" + plain + @click="handleDetailCancel">取消 新增 @@ -50,7 +51,7 @@
- @@ -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"> 删除
@@ -95,7 +96,7 @@
- 取消 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 @@ 新增 批量审核 批量驳回 导出 +
@@ -42,7 +48,7 @@ + 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"> 删除 @@ -505,7 +511,7 @@ ...mapGetters(["permission"]), permissionList() { return { - addBtn: true, + addBtn: false, viewBtn: false, delBtn: true, editBtn: true @@ -634,6 +640,10 @@ this.readonlyForm=false; this.frame_class = null; }, + addrow(){ + this.attachment_form.ticketCode = this.tab1_form.workTicketNo; + this.$refs.crud.rowAdd() + }, updateToSearch () { this.readonlyForm=true; this.shouldShowButton=true; diff --git a/src/views/spares/material.vue b/src/views/spares/material.vue index c434b2b..d888254 100644 --- a/src/views/spares/material.vue +++ b/src/views/spares/material.vue @@ -103,13 +103,30 @@ export default { data() { + var validateInCount = (rule, value, callback) => { + if (value === '') { + callback(new Error('请输入入库数量')); + } else { + var r = /^\+?[0-9][0-9]*$/; + if(!r.test(value)) { + callback(new Error('入库数量不合法')); + } else { + callback(); + } + } + }; var validateCount = (rule, value, callback) => { if (value === '') { callback(new Error('请输入出库数量')); - } else if(this.count < value) { - callback(new Error('输入的出库数量大于库存数量')); } else { - callback(); + var r = /^\+?[0-9][0-9]*$/; + if(!r.test(value)) { + callback(new Error('出库数量不合法')); + } else if(this.count < value) { + callback(new Error('输入的出库数量大于库存数量')); + } else { + callback(); + } } }; return { @@ -329,11 +346,7 @@ label: "入库数量", prop: "inboundCount", span: 22, - rules: [{ - required: true, - message: "请输入入库数量", - trigger: "blur" - }] + rules: [{required: true, validator: validateInCount, trigger: 'blur' }] }, { label: "入库申领人", diff --git a/src/views/spares/materialDetail.vue b/src/views/spares/materialDetail.vue index 5db6cb9..78e8882 100644 --- a/src/views/spares/materialDetail.vue +++ b/src/views/spares/materialDetail.vue @@ -442,6 +442,7 @@ }, methods: { test(val) { + this.$refs.diaForm.resetForm(); this.dialogVisible = true; }, handleFormSubmit() {