liuyiliang
/
smart-om-web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
main
yangzhicheng 11 months ago
parent 8c63d84864 a4defadf58
commit 65bdaef8dd
10 changed files with 75 additions and 49 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 13
      src/views/inspection/inspectionobject.vue
  2. 10
      src/views/inspection/inspectionobjectDetail.vue
  3. 4
      src/views/inspection/inspectiontasks.vue
  4. 21
      src/views/inspection/inspectiontasksDetail.vue
  5. 8
      src/views/leger/equipmentledger.vue
  6. 12
      src/views/leger/equipmentledgerDetail.vue
  7. 10
      src/views/leger/toolinventoryrecord.vue
  8. 22
      src/views/leger/toolinventoryrecordDetail.vue
  9. 12
      src/views/smart/workpermit.vue
  10. 12
      src/views/smart/workpermitDetail.vue

13
src/views/inspection/inspectionobject.vue
Unescape View File

@ -24,36 +24,39 @@
size="small" size="small"
icon="el-icon-delete" icon="el-icon-delete"
plain plain
v-if="permission.inspectionroute_delete" v-if="permission.inspectionobject_delete"
@click="handleDelete">批量删除 @click="handleDelete">批量删除
</el-button> </el-button>
</template> </template>
<template slot="menuRight"> <template slot="menuRight">
<el-button type="primary" <el-button type="primary"
size="small" size="small"
v-if="permission.inspectionroute_add" v-if="permission.inspectionobject_add"
plain plain
@click="handleDetailAdd">新增 @click="handleDetailAdd">新增
</el-button> </el-button>
<el-button type="primary" <el-button type="primary"
size="small" size="small"
plain plain
v-if="permission.inspectionobject_effect"
@click="handleTakeEffect">生效 @click="handleTakeEffect">生效
</el-button> </el-button>
<el-button type="primary" <el-button type="primary"
size="small" size="small"
plain plain
v-if="permission.inspectionobject_lapse"
@click="handleLapse">失效 @click="handleLapse">失效
</el-button> </el-button>
<el-button type="primary" <el-button type="primary"
size="small" size="small"
plain plain
v-if="permission.inspectionobject_export"
@click="handleExport">导出 @click="handleExport">导出
</el-button> </el-button>
</template> </template>
<template #menu="{row,index,size}"> <template #menu="{row,index,size}">
<el-button v-if="permission.inspectionroute_view" @click="handleDetailSearch(row,index)" type="text">查看</el-button> <el-button v-if="permission.inspectionobject_view" @click="handleDetailSearch(row,index)" type="text">查看</el-button>
<el-button v-if="permission.inspectionroute_delete" @click="rowDel(row)" type="text">删除</el-button> <el-button v-if="permission.inspectionobject_delete" @click="rowDel(row)" type="text">删除</el-button>
</template> </template>
</avue-crud> </avue-crud>
<el-dialog title="失效" <el-dialog title="失效"
@ -232,7 +235,7 @@
...mapGetters(["permission"]), ...mapGetters(["permission"]),
permissionList() { permissionList() {
// this.option.column = this.option.column.filter(v => { // this.option.column = this.option.column.filter(v => {
// return this.permission['inspectionroute_col_' + v.prop] // return this.permission['inspectionobject_col_' + v.prop]
// }) // })
return { return {
addBtn: false, addBtn: false,

10
src/views/inspection/inspectionobjectDetail.vue
Unescape View File

@ -9,14 +9,14 @@
<div class="container"> <div class="container">
<span > <span >
<el-button type="primary" <el-button type="primary"
size="large" size="small"
@click="handleFormSubmit" @click="handleFormSubmit"
v-if="addUpdateShowButton"> v-if="addUpdateShowButton && permission.inspectionobject_add">
确定</el-button> 确定</el-button>
<el-button type="primary" <el-button type="primary"
size="small" size="small"
@click="seachToUpdate" @click="seachToUpdate"
v-if="shouldShowButton"> v-if="shouldShowButton && permission.inspectionobject_edit">
修改</el-button> 修改</el-button>
</span> </span>
</div> </div>
@ -30,7 +30,7 @@ import {getToken} from "@/util/auth";
import request from "@/router/axios"; import request from "@/router/axios";
export default { export default {
name: "inspectionrouteDetail", name: "inspectionobjectDetail",
data() { data() {
return { return {
addUpdateShowButton:{}, addUpdateShowButton:{},
@ -233,7 +233,7 @@ export default {
...mapGetters(["permission"]), ...mapGetters(["permission"]),
permissionList() { permissionList() {
// this.option.column = this.option.column.filter(v => { // this.option.column = this.option.column.filter(v => {
// return this.permission['inspectionroute_col_' + v.prop] // return this.permission['inspectionobject_col_' + v.prop]
// }) // })
return { return {
addBtn: false, addBtn: false,

4
src/views/inspection/inspectiontasks.vue
Unescape View File

@ -109,6 +109,10 @@
callback(new Error('请输入任务执行开始时间')); callback(new Error('请输入任务执行开始时间'));
} else if(this.currStartDate > value.replaceAll('/','').slice(0, 8)) { } else if(this.currStartDate > value.replaceAll('/','').slice(0, 8)) {
callback(new Error('输入的任务执行开始时间小于任务开始日期')); 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 { } else {
callback(); callback();
} }

21
src/views/inspection/inspectiontasksDetail.vue
Unescape View File

@ -52,7 +52,18 @@ import request from "@/router/axios";
export default { export default {
name: "inspectiontasksDetail", name: "inspectiontasksDetail",
data () { 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 === '') { if (value === '') {
callback(new Error('请输入任务完成日期')); callback(new Error('请输入任务完成日期'));
} else if(this.information_form.taskStartDate > value) { } else if(this.information_form.taskStartDate > value) {
@ -132,11 +143,7 @@ export default {
labelWidth: 120, labelWidth: 120,
format: 'yyyy年MM月dd日', format: 'yyyy年MM月dd日',
valueFormat: "yyyyMMdd", valueFormat: "yyyyMMdd",
rules: [{ rules: [{required: true, validator: validateStartTime, trigger: 'blur' }]
required: true,
message: "请输入任务开始日期",
trigger: "blur"
}]
}, },
{ {
label: "任务完成日期", label: "任务完成日期",
@ -146,7 +153,7 @@ export default {
labelWidth: 120, labelWidth: 120,
format: 'yyyy年MM月dd日', format: 'yyyy年MM月dd日',
valueFormat: "yyyyMMdd", valueFormat: "yyyyMMdd",
rules: [{required: true, validator: validateTime, trigger: 'blur' }] rules: [{required: true, validator: validateEndTime, trigger: 'blur' }]
}, },
{ {
label: "对象编号", label: "对象编号",

8
src/views/leger/equipmentledger.vue
Unescape View File

@ -32,27 +32,31 @@
<el-button type="primary" <el-button type="primary"
size="small" size="small"
plain plain
v-if="permission.equipmentledger_add"
@click="handleDetailAdd">新增 @click="handleDetailAdd">新增
</el-button> </el-button>
<el-button type="primary" <el-button type="primary"
size="small" size="small"
plain plain
v-if="permission.equipmentledger_audit"
@click="handleAuditing">批量审核 @click="handleAuditing">批量审核
</el-button> </el-button>
<el-button type="primary" <el-button type="primary"
size="small" size="small"
plain plain
v-if="permission.equipmentledger_reject"
@click="handleReject">批量驳回 @click="handleReject">批量驳回
</el-button> </el-button>
<el-button type="primary" <el-button type="primary"
size="small" size="small"
plain plain
v-if="permission.equipmentledger_export"
@click="handleExport()">导出 @click="handleExport()">导出
</el-button> </el-button>
</template> </template>
<template #menu="{row,index,size}"> <template #menu="{row,index,size}">
<el-button @click="handleDetailSearch(row,index)" type="text">查看详情</el-button> <el-button @click="handleDetailSearch(row,index)" type="text" v-if="permission.equipmentledger_view">查看详情</el-button>
<el-button @click="rowDel(row)" type="text">删除</el-button> <el-button @click="rowDel(row)" type="text" v-if="permission.equipmentledger_delete">删除</el-button>
</template> </template>
</avue-crud> </avue-crud>
</basic-container> </basic-container>

12
src/views/leger/equipmentledgerDetail.vue
Unescape View File

@ -75,32 +75,32 @@
<el-button type="primary" <el-button type="primary"
size="large" size="large"
@click="handleFormSubmit" @click="handleFormSubmit"
v-if="addUpdateShowButton"> v-if="addUpdateShowButton && permission.equipmentledger_add">
确定</el-button> 确定</el-button>
<el-button type="text" <el-button type="text"
size="large" size="large"
@click="back" @click="back"
v-if="addUpdateShowButton"> v-if="addUpdateShowButton ">
取消</el-button> 取消</el-button>
<el-button type="primary" <el-button type="primary"
size="small" size="small"
@click="auditing" @click="auditing"
v-if="shouldShowButton"> v-if="shouldShowButton && permission.equipmentledger_audit">
审核</el-button> 审核</el-button>
<el-button type="primary" <el-button type="primary"
size="small" size="small"
@click="reject" @click="reject"
v-if="shouldShowButton"> v-if="shouldShowButton && permission.equipmentledger_reject">
驳回</el-button> 驳回</el-button>
<el-button type="primary" <el-button type="primary"
size="small" size="small"
@click="seachToUpdate" @click="seachToUpdate"
v-if="UpdateShowButton"> v-if="UpdateShowButton && permission.equipmentledger_edit">
修改</el-button> 修改</el-button>
<el-button type="primary" <el-button type="primary"
size="small" size="small"
@click="del" @click="del"
v-if="shouldShowButton"> v-if="shouldShowButton && permission.equipmentledger_delete">
删除</el-button> 删除</el-button>
</span> </span>
</div> </div>

10
src/views/leger/toolinventoryrecord.vue
Unescape View File

@ -31,27 +31,31 @@
<el-button type="primary" <el-button type="primary"
size="small" size="small"
plain plain
v-if="permission.toolinventoryrecord_add"
@click="handleDetailAdd">新增 @click="handleDetailAdd">新增
</el-button> </el-button>
<el-button type="primary" <el-button type="primary"
size="small" size="small"
plain plain
v-if="permission.toolinventoryrecord_audit"
@click="handleAuditing">批量审核 @click="handleAuditing">批量审核
</el-button> </el-button>
<el-button type="primary" <el-button type="primary"
size="small" size="small"
plain plain
v-if="permission.toolinventoryrecord_reject"
@click="handleReject">批量驳回 @click="handleReject">批量驳回
</el-button> </el-button>
<el-button type="primary" <el-button type="primary"
size="small" size="small"
plain plain
@click="handleExport">导出 v-if="permission.toolinventoryrecord_export"
@click="handleExport()">导出
</el-button> </el-button>
</template> </template>
<template #menu="{row,index,size}"> <template #menu="{row,index,size}">
<el-button @click="handleDetailSearch(row,index)" type="text">查看</el-button> <el-button @click="handleDetailSearch(row,index)" type="text" v-if="permission.toolinventoryrecord_view">查看详情</el-button>
<el-button @click="rowDel(row)" type="text">删除</el-button> <el-button @click="rowDel(row)" type="text" v-if="permission.toolinventoryrecord_delete">删除</el-button>
</template> </template>
</avue-crud> </avue-crud>
</basic-container> </basic-container>

22
src/views/leger/toolinventoryrecordDetail.vue
Unescape View File

@ -100,35 +100,35 @@
</span> </span>
<div class="container"> <div class="container">
<span > <span >
<el-button type="text"
size="large"
@click="back"
v-if="addUpdateShowButton">
取消</el-button>
<el-button type="primary" <el-button type="primary"
size="large" size="large"
@click="handleFormSubmit" @click="handleFormSubmit"
v-if="addUpdateShowButton"> v-if="addUpdateShowButton && permission.toolinventoryrecord_add">
确定</el-button> 确定</el-button>
<el-button type="text"
size="large"
@click="back"
v-if="addUpdateShowButton ">
取消</el-button>
<el-button type="primary" <el-button type="primary"
size="small" size="small"
@click="auditing" @click="auditing"
v-if="shouldShowButton"> v-if="shouldShowButton && permission.toolinventoryrecord_audit">
审核</el-button> 审核</el-button>
<el-button type="primary" <el-button type="primary"
size="small" size="small"
@click="reject" @click="reject"
v-if="shouldShowButton"> v-if="shouldShowButton && permission.toolinventoryrecord_reject">
驳回</el-button> 驳回</el-button>
<el-button type="primary" <el-button type="primary"
size="small" size="small"
@click="seachToUpdate" @click="seachToUpdate"
v-if="UpdateShowButton"> v-if="UpdateShowButton && permission.toolinventoryrecord_edit">
修改</el-button> 修改</el-button>
<el-button type="primary" <el-button type="primary"
size="small" size="small"
@click="del" @click="del"
v-if="shouldShowButton"> v-if="shouldShowButton && permission.toolinventoryrecord_delete">
删除</el-button> 删除</el-button>
</span> </span>
</div> </div>
@ -173,7 +173,7 @@ import {readonly} from "vue";
import {getToken} from "@/util/auth"; import {getToken} from "@/util/auth";
import {getListByTaskNo} from "@/api/inspection/inspectionresult"; import {getListByTaskNo} from "@/api/inspection/inspectionresult";
export default { export default {
name: "equipmentledgerDetail", name: "toolinventoryrecordDetail",
data () { data () {
return { return {
checkStatusValue:{}, checkStatusValue:{},

12
src/views/smart/workpermit.vue
Unescape View File

@ -23,7 +23,7 @@
size="small" size="small"
icon="el-icon-delete" icon="el-icon-delete"
plain plain
v-if="permission.equipmentledger_delete" v-if="permission.workpermit_delete"
@click="handleDelete">批量删除 @click="handleDelete">批量删除
</el-button> </el-button>
</template> </template>
@ -31,28 +31,32 @@
<el-button type="primary" <el-button type="primary"
size="small" size="small"
plain plain
v-if="permission.workpermit_add"
@click="handleDetailAdd">新增 @click="handleDetailAdd">新增
</el-button> </el-button>
<el-button type="primary" <el-button type="primary"
size="small" size="small"
plain plain
v-if="permission.workpermit_audit"
@click="handleAuditing">批量审核 @click="handleAuditing">批量审核
</el-button> </el-button>
<el-button type="primary" <el-button type="primary"
size="small" size="small"
plain plain
v-if="permission.workpermit_reject"
@click="handleReject">批量驳回 @click="handleReject">批量驳回
</el-button> </el-button>
<el-button type="primary" <el-button type="primary"
size="small" size="small"
plain plain
v-if="permission.workpermit_export"
@click="handleExport()">导出 @click="handleExport()">导出
</el-button> </el-button>
</template> </template>
<template #menu="{row,index,size}"> <template #menu="{row,index,size}">
<el-button @click="handleDetailSearch(row,index)" type="text">查看详情</el-button> <el-button @click="handleDetailSearch(row,index)" type="text" v-if="permission.workpermit_view">查看详情</el-button>
<el-button @click="handleCloseTicket(row)" type="text">关票</el-button> <el-button @click="handleCloseTicket(row)" type="text" v-if="permission.workpermit_close">关票</el-button>
<el-button @click="rowDel(row)" type="text">删除</el-button> <el-button @click="rowDel(row)" type="text" v-if="permission.workpermit_delete">删除</el-button>
</template> </template>
</avue-crud> </avue-crud>
<el-dialog title="关票提醒" <el-dialog title="关票提醒"

12
src/views/smart/workpermitDetail.vue
Unescape View File

@ -48,7 +48,7 @@
<el-button type="primary" <el-button type="primary"
size="large" size="large"
@click="handleFormSubmit" @click="handleFormSubmit"
v-if="addUpdateShowButton"> v-if="addUpdateShowButton && permission.workpermit_add">
确定</el-button> 确定</el-button>
<el-button type="text" <el-button type="text"
size="large" size="large"
@ -58,27 +58,27 @@
<el-button type="primary" <el-button type="primary"
size="small" size="small"
@click="closeTicket" @click="closeTicket"
v-if="shouldShowButton"> v-if="shouldShowButton && permission.workpermit_close">
关票</el-button> 关票</el-button>
<el-button type="primary" <el-button type="primary"
size="small" size="small"
@click="auditing" @click="auditing"
v-if="shouldShowButton"> v-if="shouldShowButton && permission.workpermit_audit">
审核</el-button> 审核</el-button>
<el-button type="primary" <el-button type="primary"
size="small" size="small"
@click="reject" @click="reject"
v-if="shouldShowButton"> v-if="shouldShowButton && permission.workpermit_reject">
驳回</el-button> 驳回</el-button>
<el-button type="primary" <el-button type="primary"
size="small" size="small"
@click="seachToUpdate" @click="seachToUpdate"
v-if="UpdateShowButton"> v-if="UpdateShowButton && permission.workpermit_edit">
修改</el-button> 修改</el-button>
<el-button type="primary" <el-button type="primary"
size="small" size="small"
@click="del" @click="del"
v-if="shouldShowButton"> v-if="shouldShowButton && permission.workorder_delete">
删除</el-button> 删除</el-button>
</span> </span>
</div> </div>

Write Preview
Loading…
Cancel
Save