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 | 169 +++++++++++++++++++++++++++++--------------------------- 1 files changed, 87 insertions(+), 82 deletions(-) diff --git a/src/views/technology/routing/routing-form.vue b/src/views/technology/routing/routing-form.vue index 4f1cafd..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,86 +494,92 @@ ></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%;"> + <el-row :gutter="10"> + <el-col :span="9"> + <el-card class="params-template"> + <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-col> + <el-col :span="15"> + <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> + </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