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
Dayu 11 months ago
parent 53b87e0a01 15d071a542
commit 1db45a0c66
13 changed files with 70 additions and 52 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/inspectionplan.vue
  4. 4
      src/views/inspection/inspectionroute.vue
  5. 8
      src/views/leger/equipmentledger.vue
  6. 10
      src/views/leger/equipmentledgerDetail.vue
  7. 10
      src/views/leger/toolinventoryrecord.vue
  8. 20
      src/views/leger/toolinventoryrecordDetail.vue
  9. 4
      src/views/smart/operationticketDetail.vue
  10. 12
      src/views/smart/workpermit.vue
  11. 12
      src/views/smart/workpermitDetail.vue
  12. 5
      src/views/spares/materialDetail.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/inspectionplan.vue
Unescape View File

@ -320,7 +320,7 @@
return; return;
} }
this.cancelBox = true; this.cancelBox = true;
this.$refs.cancelForm.resetForm(); this.cancelForm.cancelReason = '';
}, },
handleDetailCancel() { handleDetailCancel() {
this.$confirm("是否将选择数据改为失效状态?", { this.$confirm("是否将选择数据改为失效状态?", {
@ -332,7 +332,7 @@
return lapse(this.ids, this.cancelForm.cancelReason); return lapse(this.ids, this.cancelForm.cancelReason);
}) })
.then(() => { .then(() => {
this.$refs.cancelForm.resetForm(); this.cancelForm.cancelReason = '';
this.cancelBox = false; this.cancelBox = false;
this.onLoad(this.page); this.onLoad(this.page);
this.$message({ this.$message({

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

@ -302,7 +302,7 @@
return; return;
} }
this.cancelBox = true; this.cancelBox = true;
this.$refs.cancelForm.resetForm(); this.cancelForm.cancelReason = '';
}, },
handleDetailCancel() { handleDetailCancel() {
this.$confirm("是否将选择数据改为失效状态?", { this.$confirm("是否将选择数据改为失效状态?", {
@ -314,7 +314,7 @@
return lapse(this.ids, this.cancelForm.cancelReason); return lapse(this.ids, this.cancelForm.cancelReason);
}) })
.then(() => { .then(() => {
this.$refs.cancelForm.resetForm(); this.cancelForm.cancelReason = '';
this.cancelBox = false; this.cancelBox = false;
this.onLoad(this.page); this.onLoad(this.page);
this.$message({ this.$message({

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>

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

@ -75,7 +75,7 @@
<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"
@ -85,22 +85,22 @@
<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>

20
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="primary"
size="large"
@click="handleFormSubmit"
v-if="addUpdateShowButton && permission.toolinventoryrecord_add">
确定</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"
size="large"
@click="handleFormSubmit"
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 () {
var validatePage = (rule, value, callback) => { var validatePage = (rule, value, callback) => {
if (value === '') { if (value === '') {

4
src/views/smart/operationticketDetail.vue
Unescape View File

@ -51,7 +51,7 @@
</span> </span>
<div class="container"> <div class="container">
<span > <span >
<el-button type="primary" <el-button type="text"
size="large" size="large"
@click="back" @click="back"
v-if="addUpdateShowButton"> v-if="addUpdateShowButton">
@ -96,7 +96,7 @@
</avue-form> </avue-form>
<div class="container"> <div class="container">
<span> <span>
<el-button type="primary" <el-button type="text"
size="small" size="small"
plain plain
@click="handleDetailCancel">取消 @click="handleDetailCancel">取消

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>

5
src/views/spares/materialDetail.vue
Unescape View File

@ -442,6 +442,8 @@
}, },
methods: { methods: {
test(val) { test(val) {
this.diaForm.code = '';
this.diaForm.type = '';
this.dialogVisible = true; this.dialogVisible = true;
}, },
handleFormSubmit() { handleFormSubmit() {
@ -630,7 +632,8 @@
if (valid) { if (valid) {
done() done()
codeAdd(this.diaForm).then(() => { codeAdd(this.diaForm).then(() => {
this.$refs.diaForm.resetForm(); this.diaForm.code = '';
this.diaForm.type = '';
this.dialogVisible = false; this.dialogVisible = false;
this.SearchClassCode(); this.SearchClassCode();
this.$message({ this.$message({

Write Preview
Loading…
Cancel
Save