modified: src/views/common/param-mergeTemplate.vue modified: src/view...

zouyu

2023-11-10 789bd1e36e88e09a45fa24fa1569330ada4c45b7

	modified:   src/views/common/param-mergeTemplate.vue
	modified:   src/views/technology/routing/routing-form.vue

 src/views/common/param-mergeTemplate.vue

@@ -275,9 +275,6 @@
</script>

<style>
.avue-crud__menu {
    display: none;
}
.avue-crud .el-table th {
    word-break: break-word;
    color: rgba(102,102,102,1);

 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>