From b3ebb6f99f647a08cac70ebd9cf1baabdffc6852 Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期三, 20 十二月 2023 14:55:56 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before
---
src/views/technology/routing/index.vue | 116 ++++++++++++++++++++--------------------------------------
1 files changed, 40 insertions(+), 76 deletions(-)
diff --git a/src/views/technology/routing/index.vue b/src/views/technology/routing/index.vue
index 4c685f1..113abba 100644
--- a/src/views/technology/routing/index.vue
+++ b/src/views/technology/routing/index.vue
@@ -13,20 +13,21 @@
ref="routingTable"
>
<template #toolbar>
- <el-button
- v-if="permissions.technology_routing_ifssync"
- type="primary"
- :loading="ifsSynsLoading"
- @click="syncIfs"
- >IFS鍚屾</el-button
- >
- <el-button
- v-if="permissions.technology_routing_advancecalc"
- type="primary"
- :loading="preCalcLoading"
- @click="calcTech"
- >鎻愬墠璁＄畻</el-button
- >
+ <el-button v-if="permissions.technology_routing_add"
+ type="primary" @click="addOrUpdateHandle">鏂板</el-button>
+ <el-button @click="() => {this.approveHandle('ACCEPT')}"
+ :disabled="uniqueStateArr.includes('01draft')"
+ v-if="permissions.technology_routing_accept">鎵瑰噯</el-button>
+ <el-button @click="() => {this.approveHandle('REVOKE')}"
+ :disabled="uniqueStateArr.includes('02accepted')"
+ v-if="permissions.technology_routing_revoke">鎾ゅ洖</el-button>
+ <el-button @click="() => {this.approveHandle('CANCEL')}"
+ :disabled="uniqueStateArr.includes('02accepted')"
+ v-if="permissions.technology_routing_cancel">鎷掔粷</el-button>
+ <el-button @click="copyRouting"
+ v-if="permissions.technology_routing_cancel">澶嶅埗</el-button>
+ <el-button @click="() => {this.deleteAll()}" type="primary"
+ v-if="permissions.technology_routing_batch_del">鎵归噺鍒犻櫎</el-button>
</template>
</ttable>
<el-dialog title="瀵煎叆" :visible.sync="importRoutingVisible" width="50%">
@@ -114,7 +115,6 @@
import {
fetchList,
delObj,
- changeState,
changeStateBatch,
exportRoutingTemplate,
routingIfsSync,
@@ -132,6 +132,7 @@
data() {
return {
ids: [],
+ uniqueStateArr: [],
ajaxFun: fetchList,
multipleSelection: [],
isShowQuery: false,
@@ -356,53 +357,7 @@
searchInfoType: 'datetimerange'
}
],
- toolbar: [
- {
- text: '鏂板',
- type: 'primary',
- fun: this.addOrUpdateHandle,
- disabled: false,
- permitArr: []
- },
- {
- text: '鎵瑰噯',
- fun: () => {
- this.approveHandle('ACCEPT')
- },
- disabled: false,
- permitArr: ['01draft']
- },
- {
- text: '鎾ゅ洖',
- fun: () => {
- this.approveHandle('REVOKE')
- },
- disabled: false,
- permitArr: ['02accepted']
- },
- {
- text: '鎷掔粷',
- fun: () => {
- this.approveHandle('CANCEL')
- },
- disabled: false,
- permitArr: ['02accepted']
- },
- {
- text: '澶嶅埗',
- fun: this.copyRouting,
- disabled: false,
- permitArr: []
- },
- {
- text: '鍒犻櫎',
- fun: () => {
- this.deleteAll()
- },
- disabled: false,
- permitArr: []
- }
- ],
+ toolbar: [],
operator: [
{
text: '鍒犻櫎',
@@ -508,6 +463,10 @@
},
// 鏂板 / 淇敼
addOrUpdateHandle(row) {
+ if(!this.permissions.technology_routing_edit && row.id!=null){
+ this.$message.error("璇ヨ鑹叉病鏈夋搷浣滄潈闄�")
+ return
+ }
this.$router.push({
name: 'routingForm',
query: { id: row == null ? null : row.id }
@@ -515,6 +474,10 @@
},
// 鍒犻櫎
deleteHandle(row) {
+ if(!this.permissions.technology_routing_del){
+ this.$message.error("璇ヨ鑹叉病鏈夋搷浣滄潈闄�")
+ return
+ }
this.$confirm('鏄惁纭鍒犻櫎宸ヨ壓缂栧彿锛�' + row.routingNo + '鎻愮ず', {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
@@ -613,21 +576,22 @@
uniqueStateArr.push(stateArr[i])
}
}
+ this.uniqueStateArr = uniqueStateArr
// 寰幆琛ㄥご鎸夐挳锛屽垽鏂瘡涓寜閽殑permitArr鏄惁瀹屽叏鍖呭惈閫変腑鐘舵�侊紝鑻ュ畬鍏ㄥ寘鍚紝鍒欐寜閽寒锛屽惁鍒欐寜閽伆
- var toolbar = this.table.toolbar
- for (var j = 0; j < toolbar.length; j++) {
- if (
- uniqueStateArr.every((val) =>
- toolbar[j].permitArr.length <= 0
- ? true
- : toolbar[j].permitArr.includes(val)
- )
- ) {
- toolbar[j].disabled = false
- } else {
- toolbar[j].disabled = true
- }
- }
+ // var toolbar = this.table.toolbar
+ // for (var j = 0; j < toolbar.length; j++) {
+ // if (
+ // uniqueStateArr.every((val) =>
+ // toolbar[j].permitArr.length <= 0
+ // ? true
+ // : toolbar[j].permitArr.includes(val)
+ // )
+ // ) {
+ // toolbar[j].disabled = false
+ // } else {
+ // toolbar[j].disabled = true
+ // }
+ // }
// 灏嗛�変腑璁板綍璧嬪�肩粰multipleSelection
this.multipleSelection = val
},
--
Gitblit v1.9.3