From 5ff704af11fc13dd48a48e133652faf1e13d178d Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期三, 15 十一月 2023 19:21:32 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/zs-mes-before
---
src/views/technology/routing/routing-form.vue | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/src/views/technology/routing/routing-form.vue b/src/views/technology/routing/routing-form.vue
index b2a7303..fa56abf 100644
--- a/src/views/technology/routing/routing-form.vue
+++ b/src/views/technology/routing/routing-form.vue
@@ -132,10 +132,10 @@
style="width: 146px;display: inline-block;font-size:12px;font-weight:bold;"
>{{ dataForm.ifsSync ? '鏄�' : '鍚�' }}</span
>
- </el-form-item>
+ </el-form-item>-->
<el-form-item label="涓诲伐鑹�" prop="master">
<el-switch v-model="dataForm.master"> </el-switch>
- </el-form-item> -->
+ </el-form-item>
</el-col>
</el-row>
</el-form>
@@ -494,8 +494,10 @@
></rich-text>
</div>
</el-tab-pane>
- <el-tab-pane v-if="dataForm.id!=null" label="宸ュ簭鍙傛暟" style="height: 100%;display: flex;">
- <el-card class="params-template" style="width:70%">
+ <el-tab-pane v-if="dataForm.id!=null" label="宸ュ簭鍙傛暟" style="height: 100%;">
+ <el-row :gutter="10">
+ <el-col :span="9">
+ <el-card class="params-template">
<div slot="header">
<span>鍙傛暟闆�</span>
<el-button
@@ -542,7 +544,9 @@
</el-table-column>
</el-table>
</el-card>
- <el-card class="template-param" style="margin-left: 10px;">
+ </el-col>
+ <el-col :span="15">
+ <el-card class="template-param">
<div slot="header">
<span>鍙傛暟</span>
<div style="float: right;">
@@ -574,6 +578,8 @@
></component>
</div>
</el-card>
+ </el-col>
+ </el-row>
</el-tab-pane>
</el-tabs>
</div>
@@ -1031,6 +1037,7 @@
},
// 鍙傛暟闆嗘ā鏉跨偣鍑讳簨浠�
templateRowClick(row) {
+
if(this.isShowTree){
this.isShowTree=false
}else{
@@ -1302,6 +1309,7 @@
this.$message.success('娣诲姞鎴愬姛')
// 閫変腑鏈�鍚庝竴涓ā鏉�
this.selectTempalteByIndex(this.operationTemplateList.length - 1)
+ this.getRoutingTemplate(this.routingOperationId)
} else {
this.$message.error('娣诲姞澶辫触')
}
@@ -1383,6 +1391,7 @@
} else {
this.$message.error('娣诲姞澶辫触')
}
+ this.templateRowClick({id: this.routingTemplateId})
})
}
},
@@ -1599,18 +1608,14 @@
}
.params-template {
- float: left;
background-color: #fff;
- width: 40%;
height: 687px;
padding: 10px 0px;
border: 1px solid #ddd;
}
.template-param {
- float: right;
background-color: #fff;
- width: calc(60% - 10px);
height: 687px;
padding: 10px 0px;
border: 1px solid #ddd;
--
Gitblit v1.9.3