From 61515d8da4b90131a4cae9e5bc1013cb0288573c Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期五, 10 十一月 2023 16:58:17 +0800
Subject: [PATCH] modified: src/views/basic/template/index.vue modified: src/views/common/param-mergeTemplate.vue modified: src/views/common/rich-text.vue modified: src/views/technology/routing/routing-form.vue
---
src/views/technology/routing/routing-form.vue | 81 ++++++++++++++--------------------------
1 files changed, 28 insertions(+), 53 deletions(-)
diff --git a/src/views/technology/routing/routing-form.vue b/src/views/technology/routing/routing-form.vue
index 723de44..4f1cafd 100644
--- a/src/views/technology/routing/routing-form.vue
+++ b/src/views/technology/routing/routing-form.vue
@@ -494,7 +494,7 @@
></rich-text>
</div>
</el-tab-pane>
- <el-tab-pane label="宸ュ簭鍙傛暟" style="height: 100%">
+ <el-tab-pane v-if="dataForm.id!=null" label="宸ュ簭鍙傛暟" style="height: 100%">
<el-card class="params-template">
<div slot="header">
<span>鍙傛暟闆�</span>
@@ -564,58 +564,15 @@
</el-button>
</div>
</div>
- <!-- <paramMergeTemplate
- :tableData="paramData"
- :page="{}"
- >
- </paramMergeTemplate> -->
- <component
+ <div>
+ <component
:is="paramMergeTemplate"
- :tableData="paramData"
+ :key="isShowTree"
+ :tableTreeData="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> -->
+ :handleParamDelete="handleParamDelete"
+ ></component>
+ </div>
</el-card>
</el-tab-pane>
</el-tabs>
@@ -700,6 +657,7 @@
return {
paramMergeTemplate: '',
itemKey: '',
+ isShowTree: false,
typeOptions: [],
paramTemplateSelArr: [],
paramTemplateSelCol: 'operationTemplateNo',
@@ -1073,6 +1031,12 @@
},
// 鍙傛暟闆嗘ā鏉跨偣鍑讳簨浠�
templateRowClick(row) {
+ if(this.isShowTree){
+ this.isShowTree=false
+ }else{
+ this.isShowTree=true
+ }
+ this.paramData=[]
this.getRoutingTemplateParam(row.id)
},
// 鏍规嵁宸ヨ壓銆佸伐搴廼d銆佹ā鏉縤d鍘昏幏鍙栨ā鏉夸笅鐨勫弬鏁�
@@ -1085,6 +1049,7 @@
})
).then((response) => {
if (response.data.data.length > 0) {
+ this.paramData = []
this.paramData = response.data.data
this.paramMergeTemplate = 'paramMergeTemplate'
} else {
@@ -1424,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