From 2fa578a18ed9055f8cb9863a8a0f02977cfa8350 Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期二, 19 十二月 2023 17:33:53 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before
---
src/views/technology/operation/index.vue | 183 +++++++++++++++++++++++----------------------
1 files changed, 94 insertions(+), 89 deletions(-)
diff --git a/src/views/technology/operation/index.vue b/src/views/technology/operation/index.vue
index b3cac78..ec5239e 100644
--- a/src/views/technology/operation/index.vue
+++ b/src/views/technology/operation/index.vue
@@ -10,7 +10,10 @@
:ajaxFun="ajaxFun"
ref="operationTable"
>
- <template #toolbar></template>
+ <template #toolbar>
+ <el-button type="primary" @click="addOrUpdateHandle"
+ v-if="permissions.technology_operation_add">鏂板</el-button>
+ </template>
</ttable>
<!-- 寮圭獥, 鏂板 / 淇敼 -->
<table-form
@@ -35,7 +38,7 @@
multipleSelection: [],
uploadInfo: {
// 鏄惁灞曠ず涓婁紶EXCEL浠ュ強瀵瑰簲鐨剈rl
- isShow: true,
+ isShow: false,
url: '/mes/operation/excel/upload'
},
prelang: 'operation',
@@ -85,15 +88,15 @@
searchInfoType: 'text'
},
// 闆朵欢鏃�
- {
- minWidth: '120',
- prop: 'partFamilyName',
- label: '闆朵欢鏃�',
- sort: true,
- isTrue: true,
- isSearch: true,
- searchInfoType: 'text'
- },
+ // {
+ // minWidth: '120',
+ // prop: 'partFamilyName',
+ // label: '闆朵欢鏃�',
+ // sort: true,
+ // isTrue: true,
+ // isSearch: true,
+ // searchInfoType: 'text'
+ // },
// 宸ヤ綔涓績
{
minWidth: '120',
@@ -109,25 +112,25 @@
}
},
// 鏈哄櫒杩愯浆鍥犵礌
- {
- minWidth: '120',
- prop: 'machRunFactor',
- label: '鏈哄櫒杩愯浆鍥犵礌',
- sort: true,
- isTrue: true,
- isSearch: true,
- searchInfoType: 'text'
- },
+ // {
+ // minWidth: '120',
+ // prop: 'machRunFactor',
+ // label: '鏈哄櫒杩愯浆鍥犵礌',
+ // sort: true,
+ // isTrue: true,
+ // isSearch: true,
+ // searchInfoType: 'text'
+ // },
// 鏈哄櫒璁剧疆鏃堕棿
- {
- minWidth: '120',
- prop: 'machSetupTime',
- label: '鏈哄櫒璁剧疆鏃堕棿',
- sort: true,
- isTrue: true,
- isSearch: true,
- searchInfoType: 'text'
- },
+ // {
+ // minWidth: '120',
+ // prop: 'machSetupTime',
+ // label: '鏈哄櫒璁剧疆鏃堕棿',
+ // sort: true,
+ // isTrue: true,
+ // isSearch: true,
+ // searchInfoType: 'text'
+ // },
// 浜哄伐绫诲埆
{
minWidth: '120',
@@ -143,62 +146,62 @@
}
},
// 鍔冲姏杩愯浆鍥犵礌
- {
- minWidth: '120',
- prop: 'laborRunFactor',
- label: '鍔冲姏杩愯浆鍥犵礌',
- sort: true,
- isTrue: true,
- isSearch: true,
- searchInfoType: 'text'
- },
+ // {
+ // minWidth: '120',
+ // prop: 'laborRunFactor',
+ // label: '鍔冲姏杩愯浆鍥犵礌',
+ // sort: true,
+ // isTrue: true,
+ // isSearch: true,
+ // searchInfoType: 'text'
+ // },
// 鍔冲姏璁剧疆鏃堕棿
- {
- minWidth: '120',
- prop: 'laborSetupTime',
- label: '鍔冲姏璁剧疆鏃堕棿',
- sort: true,
- isTrue: true,
- isSearch: true,
- searchInfoType: 'text'
- },
+ // {
+ // minWidth: '120',
+ // prop: 'laborSetupTime',
+ // label: '鍔冲姏璁剧疆鏃堕棿',
+ // sort: true,
+ // isTrue: true,
+ // isSearch: true,
+ // searchInfoType: 'text'
+ // },
// 鍥犵礌鍗曚綅
- {
- minWidth: '120',
- prop: 'runTimeCodeDb',
- label: '鍥犵礌鍗曚綅',
- sort: true,
- isTrue: true,
- isSearch: true,
- searchInfoType: 'select',
- formatter: this.formatRunTimeCodeDbType,
- optList: () => {
- return this.runTimeCodeDbTypeOptions
- }
- },
+ // {
+ // minWidth: '120',
+ // prop: 'runTimeCodeDb',
+ // label: '鍥犵礌鍗曚綅',
+ // sort: true,
+ // isTrue: true,
+ // isSearch: true,
+ // searchInfoType: 'select',
+ // formatter: this.formatRunTimeCodeDbType,
+ // optList: () => {
+ // return this.runTimeCodeDbTypeOptions
+ // }
+ // },
// 鐝粍浜哄憳
- {
- minWidth: '120',
- prop: 'crewSize',
- label: '鐝粍浜哄憳',
- sort: true,
- isTrue: true,
- isSearch: true,
- searchInfoType: 'text'
- },
- {
- minWidth: '120',
- prop: 'outsideOpItem',
- label: '澶栭儴宸ュ簭椤圭洰',
- sort: true,
- isTrue: true,
- isSearch: true,
- searchInfoType: 'select',
- formatter: this.formatOutsideOpItem,
- optList: () => {
- return this.outsideOpItemOptions
- }
- },
+ // {
+ // minWidth: '120',
+ // prop: 'crewSize',
+ // label: '鐝粍浜哄憳',
+ // sort: true,
+ // isTrue: true,
+ // isSearch: true,
+ // searchInfoType: 'text'
+ // },
+ // {
+ // minWidth: '120',
+ // prop: 'outsideOpItem',
+ // label: '澶栭儴宸ュ簭椤圭洰',
+ // sort: true,
+ // isTrue: true,
+ // isSearch: true,
+ // searchInfoType: 'select',
+ // formatter: this.formatOutsideOpItem,
+ // optList: () => {
+ // return this.outsideOpItemOptions
+ // }
+ // },
// 澶囨敞
{
minWidth: '120',
@@ -220,13 +223,7 @@
searchInfoType: 'datetimerange'
}
],
- toolbar: [
- {
- text: '鏂板',
- type: 'primary',
- fun: this.addOrUpdateHandle
- }
- ],
+ toolbar: [],
operator: [
{
text: '鍒犻櫎',
@@ -271,6 +268,10 @@
},
// 鏂板 / 淇敼
addOrUpdateHandle(row) {
+ if(!this.permissions.technology_operation_edit && row.id!=null){
+ this.$message.error("璇ヨ鑹叉病鏈夋搷浣滄潈闄�")
+ return
+ }
this.$router.push({
name: 'operationForm',
params: { id: row == null ? null : row.id }
@@ -278,6 +279,10 @@
},
// 鍒犻櫎
deleteHandle(row) {
+ if(!this.permissions.technology_operation_del){
+ this.$message.error("璇ヨ鑹叉病鏈夋搷浣滄潈闄�")
+ return
+ }
this.$confirm('鏄惁纭鍒犻櫎缂栧彿涓�' + row.operationNo, '鎻愮ず', {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
--
Gitblit v1.9.3