From d7bb04a5461b7eb8beb422108a21696b21126e71 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期五, 10 十一月 2023 13:26:39 +0800
Subject: [PATCH] modified: src/views/basic/template/index.vue modified: src/views/common/param-mergeTemplate.vue modified: src/views/technology/routing/routing-form.vue
---
src/views/technology/routing/routing-form.vue | 70 ++++++----------------------------
1 files changed, 13 insertions(+), 57 deletions(-)
diff --git a/src/views/technology/routing/routing-form.vue b/src/views/technology/routing/routing-form.vue
index e4d0294..aaab516 100644
--- a/src/views/technology/routing/routing-form.vue
+++ b/src/views/technology/routing/routing-form.vue
@@ -565,67 +565,14 @@
</div>
</div>
<div>
- <!-- <paramMergeTemplate :key="isShowTree" :tableTreeData="paramData" :routingTemplateId="routingTemplateId"/> -->
<component
:is="paramMergeTemplate"
:key="isShowTree"
:tableTreeData="paramData"
:routingTemplateId="routingTemplateId"
+ :handleParamDelete="handleParamDelete"
></component>
</div>
- <!-- <paramMergeTemplate
- :tableData="paramData"
- :page="{}"
- >
- </paramMergeTemplate> -->
- <!-- <component
- :is="paramMergeTemplate"
- :key="isShowTree"
- :tableData="paramData"
- :routingTemplateId="routingTemplateId"
- ></component> -->
- <!-- <el-table :data="paramData" class="l-mes" height="600">
- <el-table-column
- label="鍙傛暟椤�"
- prop="parameterItem"
- align="center"
- >
- <template slot-scope="scope">
- <span
- >{{ scope.row.parameterItem }}({{
- scope.row.unit
- }})</span
- >
- </template>
- </el-table-column>
- <el-table-column
- label="鍙傛暟绫诲瀷"
- prop="type"
- align="center"
- :formatter="getParam"
- >
- </el-table-column>
- <el-table-column label="鍊�" prop="paramValue" align="center">
- <template slot-scope="scope">
- <el-input
- v-model="scope.row.paramValue"
- placeholder="鍊�"
- :disabled="!editable"
- ></el-input>
- </template>
- </el-table-column>
- <el-table-column label="鎿嶄綔" align="center">
- <template slot-scope="scope">
- <el-button
- type="text"
- size="mini"
- v-if="editable && routingTemplateId != null"
- @click.stop="handleParamDelete(scope.row, scope.$index)"
- >鍒犻櫎
- </el-button>
- </template>
- </el-table-column>
- </el-table> -->
</el-card>
</el-tab-pane>
</el-tabs>
@@ -1089,7 +1036,6 @@
}else{
this.isShowTree=true
}
- console.log(this.isShowTree);
this.paramData=[]
this.getRoutingTemplateParam(row.id)
},
@@ -1443,13 +1389,23 @@
// 鍒犻櫎鍙傛暟
handleParamDelete(row, index) {
- this.$confirm('鏄惁纭鍒犻櫎鍙傛暟椤逛负' + row.parameterItem, '鎻愮ず', {
+ this.$confirm('鏄惁纭鍒犻櫎鍙傛暟椤逛负銆�' + row.paramItem +'銆戠殑鏁版嵁?', '鎻愮ず', {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
type: 'warning'
})
.then(function() {
- return deleteRoutingTemplateParam(row.id)
+ let id = null
+ if(row.treeId && row.treeId!='null'){
+ id = row.treeId
+ }else{
+ if(row.twoId && row.twoId!='null'){
+ id = row.twoId
+ }else{
+ id = row.oneId
+ }
+ }
+ return deleteRoutingTemplateParam(id)
})
.then((response) => {
const data = response.data
--
Gitblit v1.9.3