From 52e18000ace434b2acdebce5e118c45c337a3fe7 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期二, 28 五月 2024 13:31:54 +0800
Subject: [PATCH] 合并冲突
---
src/views/basic/template/index.vue | 35 +++++++++++++++++++++--------------
1 files changed, 21 insertions(+), 14 deletions(-)
diff --git a/src/views/basic/template/index.vue b/src/views/basic/template/index.vue
index 8f1de0a..8a1bfd7 100644
--- a/src/views/basic/template/index.vue
+++ b/src/views/basic/template/index.vue
@@ -111,7 +111,7 @@
<el-table-column label="鍗曚綅" prop="unit" align="center">
</el-table-column>
- <el-table-column label="鎿嶄綔" align="center"
+ <el-table-column label="鎿嶄綔" align="center"
v-if="permissions.technology_operationtemplate_param_edit">
<template slot-scope="scope">
<el-button
@@ -267,15 +267,7 @@
}
],
toolbar: [],
- operator: [
- {
- text: '鍒犻櫎',
- icon: 'el-icon-delete',
- type: 'text',
- size: 'small',
- fun: this.deleteHandle
- }
- ],
+ operator: null,
operatorConfig: {
fixed: 'right',
label: '鎿嶄綔',
@@ -290,6 +282,19 @@
ttable,
TableForm,
ParamDialog
+ },
+ created(){
+ if(this.permissions.technology_operationtemplate_del){
+ this.table.operator = [
+ {
+ text: '鍒犻櫎',
+ icon: 'el-icon-delete',
+ type: 'text',
+ size: 'small',
+ fun: this.deleteHandle
+ }
+ ]
+ }
},
computed: {
...mapGetters(['permissions'])
@@ -432,10 +437,6 @@
},
// 鍒犻櫎
deleteHandle(row) {
- if(!this.permissions.technology_operationtemplate_del){
- this.$message.error("璇ヨ鑹叉病鏈夋搷浣滄潈闄�")
- return
- }
this.$confirm('鏄惁纭鍒犻櫎妯℃澘缂栧彿涓�' + row.templateNo, '鎻愮ず', {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
@@ -615,6 +616,12 @@
var obj = {}
obj.technologyOperationParamId = row.id
obj.technologyOperationTemplateId = row.technologyOperationTemplateId
+ if(row.defaultValue!=null){
+ row.defaultValue=row.defaultValue.replace(',','锛�').replace('(','锛�').replace(')','锛�')
+ if (!isNaN(row.defaultValue)) {
+ row.defaultValue='='+row.defaultValue
+ }
+ }
obj.defaultValue = row.defaultValue
putRelateOperationParamTemplate(obj).then((response) => {
this.$message.success('鍙傛暟淇濆瓨鎴愬姛')
--
Gitblit v1.9.3