zs-mes-before.git

			@@ -494,86 +494,92 @@
			></rich-text>
			</div>
			</el-tab-pane>
			<el-tab-pane 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>
			@@ -1599,18 +1605,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;