From c807040fe243a4e36aa73dd8962791d6ee4ff7f0 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期二, 19 十二月 2023 16:41:08 +0800
Subject: [PATCH] modified: src/views/technology/operation/index.vue modified: src/views/technology/routing/routing-form.vue modified: src/views/technology/structure/index.vue modified: vue.config.js
---
vue.config.js | 4 +-
src/views/technology/routing/routing-form.vue | 3 +
src/views/technology/operation/index.vue | 21 ++++++----
src/views/technology/structure/index.vue | 35 +++++++----------
4 files changed, 31 insertions(+), 32 deletions(-)
diff --git a/src/views/technology/operation/index.vue b/src/views/technology/operation/index.vue
index 70e46eb..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
@@ -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: '鍙栨秷',
diff --git a/src/views/technology/routing/routing-form.vue b/src/views/technology/routing/routing-form.vue
index c2ddbf2..a2b260e 100644
--- a/src/views/technology/routing/routing-form.vue
+++ b/src/views/technology/routing/routing-form.vue
@@ -657,7 +657,8 @@
typeOptions: [],
paramTemplateSelArr: [],
paramTemplateSelCol: 'operationTemplateNo',
- templateDefaultObj: { dataType: '鐢熶骇瑕佹眰' },
+ // templateDefaultObj: { dataType: '鐢熶骇瑕佹眰' },
+ templateDefaultObj: {},
paramSelArr: [],
paramSelCol: 'code',
operationIndex: null,
diff --git a/src/views/technology/structure/index.vue b/src/views/technology/structure/index.vue
index 53ae977..17fed50 100644
--- a/src/views/technology/structure/index.vue
+++ b/src/views/technology/structure/index.vue
@@ -13,13 +13,13 @@
ref="structureTable"
>
<template #toolbar>
- <!-- <el-button type="primary" :loading="ifsSynsLoading" @click="syncIfs"
- >ERP鍚屾</el-button
- > -->
+ <el-button type="primary" @click="addOrUpdateHandle"
+ v-if="permissions.technology_structure_add">鏂板</el-button>
+ <el-button type="primary" @click="copyStructure"
+ v-if="permissions.technology_structure_copy">澶嶅埗</el-button>
</template>
</ttable>
<!-- 寮圭獥, 鏂板 / 淇敼 -->
- <!--<table-form v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getData"></table-form>-->
<el-dialog
title="瀵煎叆"
:visible.sync="importStructureVisible"
@@ -230,22 +230,7 @@
noShowTip: false
}
],
- toolbar: [
- {
- text: '鏂板',
- // icon: 'el-icon-plus',
- type: 'primary',
- fun: this.addOrUpdateHandle,
- disabled: false,
- permitArr: []
- },
- {
- text: '澶嶅埗',
- fun: this.copyStructure,
- disabled: false,
- permitArr: []
- }
- ],
+ toolbar: [],
operator: [
{
text: '鍒犻櫎',
@@ -313,6 +298,7 @@
this.getData()
},
created() {
+ this.uploadInfo.isShow = this.permissions.technology_structure_upload
this.table.column.find((e) => e.label === '宸插悓姝ヨ嚦ERP').isTrue = false
this.getBomTypeDbOptions()
},
@@ -332,14 +318,21 @@
},
// 鏂板 / 淇敼
addOrUpdateHandle(row) {
+ if(!this.permissions.technology_structure_edit && row.id!=null){
+ this.$message.error("璇ヨ鑹叉病鏈夋搷浣滄潈闄�")
+ return
+ }
this.$router.push({
name: 'singleStructureForm',
params: { id: row == null ? null : row.id }
})
- // this.$router.push({name:"structureForm",query:{id:row==null?null:row.id}})
},
// 鍒犻櫎
deleteHandle(row) {
+ if(!this.permissions.technology_structure_del){
+ this.$message.error("璇ヨ鑹叉病鏈夋搷浣滄潈闄�")
+ return
+ }
this.$confirm('鏄惁纭鍒犻櫎ID涓�' + row.id, '鎻愮ず', {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
diff --git a/vue.config.js b/vue.config.js
index 87d2793..6cc7723 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -7,12 +7,12 @@
// const url = 'http://192.168.2.7:9999'
// const url = 'http://192.168.32.45:9999'
// const url = 'http://192.168.2.7:9999'
-const url = 'http://192.168.32.45:9999'
+// const url = 'http://192.168.32.45:9999'
//const url = 'http://192.168.2.7:9999'
//const url = 'http://192.168.32.45:9999'
// const url = 'http://192.168.0.23:9999'
-// const url = 'http://localhost:9999'
+const url = 'http://localhost:9999'
const localUrl = 'http://localhost:8089'
--
Gitblit v1.9.3