From 789bd1e36e88e09a45fa24fa1569330ada4c45b7 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期五, 10 十一月 2023 17:40:43 +0800
Subject: [PATCH] modified: src/views/common/param-mergeTemplate.vue modified: src/views/technology/routing/routing-form.vue
---
src/views/technology/routing/routing-form.vue | 152 +++++++++++++++++++++++++-------------------------
1 files changed, 76 insertions(+), 76 deletions(-)
diff --git a/src/views/technology/routing/routing-form.vue b/src/views/technology/routing/routing-form.vue
index 4f1cafd..b2a7303 100644
--- a/src/views/technology/routing/routing-form.vue
+++ b/src/views/technology/routing/routing-form.vue
@@ -494,86 +494,86 @@
></rich-text>
</div>
</el-tab-pane>
- <el-tab-pane v-if="dataForm.id!=null" label="宸ュ簭鍙傛暟" style="height: 100%">
- <el-card class="params-template">
- <div slot="header">
- <span>鍙傛暟闆�</span>
- <el-button
- style="float: right; padding: 3px 0"
- type="text"
- size="medium"
- v-if="editable && dataForm.operations.length > 0"
- @click="openTempalteDialog"
- >娣诲姞
- </el-button>
- </div>
- <el-table
- ref="templateTable"
- :data="operationTemplateList"
- class="l-mes"
- height="600"
- highlight-current-row
- @row-click="templateRowClick"
- >
- <el-table-column
- label="鍚嶇О"
- prop="operationTemplateName"
- align="center"
- >
- </el-table-column>
- <el-table-column
- label="绫诲瀷"
- prop="operationTemplateType"
- align="center"
- >
- </el-table-column>
- <el-table-column label="鎿嶄綔" align="center">
- <template slot-scope="scope">
+ <el-tab-pane v-if="dataForm.id!=null" label="宸ュ簭鍙傛暟" style="height: 100%;display: flex;">
+ <el-card class="params-template" style="width:70%">
+ <div slot="header">
+ <span>鍙傛暟闆�</span>
<el-button
+ style="float: right; padding: 3px 0"
type="text"
- size="mini"
+ size="medium"
v-if="editable && dataForm.operations.length > 0"
- @click.stop="
- handleTemplateDelete(scope.row, scope.$index)
- "
- >鍒犻櫎
+ @click="openTempalteDialog"
+ >娣诲姞
</el-button>
- </template>
- </el-table-column>
- </el-table>
- </el-card>
- <el-card class="template-param">
- <div slot="header">
- <span>鍙傛暟</span>
- <div style="float: right;">
- <el-button
- style="padding: 3px 0"
- type="text"
- size="medium"
- v-if="editable && routingTemplateId != null"
- @click="saveAllParamChange"
- >淇濆瓨
- </el-button>
- <el-button
- style="padding: 3px 0"
- type="text"
- size="medium"
- v-if="editable && routingTemplateId != null"
- @click="openTempalteParamDialog"
- >娣诲姞
- </el-button>
- </div>
- </div>
- <div>
- <component
- :is="paramMergeTemplate"
- :key="isShowTree"
- :tableTreeData="paramData"
- :routingTemplateId="routingTemplateId"
- :handleParamDelete="handleParamDelete"
- ></component>
- </div>
- </el-card>
+ </div>
+ <el-table
+ ref="templateTable"
+ :data="operationTemplateList"
+ class="l-mes"
+ height="600"
+ highlight-current-row
+ @row-click="templateRowClick"
+ >
+ <el-table-column
+ label="鍚嶇О"
+ prop="operationTemplateName"
+ align="center"
+ >
+ </el-table-column>
+ <el-table-column
+ label="绫诲瀷"
+ prop="operationTemplateType"
+ align="center"
+ >
+ </el-table-column>
+ <el-table-column label="鎿嶄綔" align="center">
+ <template slot-scope="scope">
+ <el-button
+ type="text"
+ size="mini"
+ v-if="editable && dataForm.operations.length > 0"
+ @click.stop="
+ handleTemplateDelete(scope.row, scope.$index)
+ "
+ >鍒犻櫎
+ </el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ </el-card>
+ <el-card class="template-param" style="margin-left: 10px;">
+ <div slot="header">
+ <span>鍙傛暟</span>
+ <div style="float: right;">
+ <el-button
+ style="padding: 3px 0"
+ type="text"
+ size="medium"
+ v-if="editable && routingTemplateId != null"
+ @click="saveAllParamChange"
+ >淇濆瓨
+ </el-button>
+ <el-button
+ style="padding: 3px 0"
+ type="text"
+ size="medium"
+ v-if="editable && routingTemplateId != null"
+ @click="openTempalteParamDialog"
+ >娣诲姞
+ </el-button>
+ </div>
+ </div>
+ <div>
+ <component
+ :is="paramMergeTemplate"
+ :key="isShowTree"
+ :tableTreeData="paramData"
+ :routingTemplateId="routingTemplateId"
+ :handleParamDelete="handleParamDelete"
+ ></component>
+ </div>
+ </el-card>
</el-tab-pane>
</el-tabs>
</div>
--
Gitblit v1.9.3