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

Fixiaobai

2023-11-10 7d960355fd82a106ae8e15f6f83d4324145e7b24

 src/views/technology/routing/routing-form.vue

@@ -564,16 +564,26 @@
                    </el-button>
                  </div>
                </div>
                <div>
                    <!-- <paramMergeTemplate :key="isShowTree" :tableTreeData="paramData" :routingTemplateId="routingTemplateId"/> -->
                <component
                :is="paramMergeTemplate" 
                :key="isShowTree"
                :tableTreeData="paramData"
                :routingTemplateId="routingTemplateId"
                ></component> 
                </div>
                <!-- <paramMergeTemplate 
                :tableData="paramData"
                :page="{}"
                >
                </paramMergeTemplate> -->
                <component 
                <!-- <component
                :is="paramMergeTemplate" 
                :key="isShowTree"
                :tableData="paramData"
                :routingTemplateId="routingTemplateId"
                ></component>
                ></component> -->
                <!-- <el-table :data="paramData" class="l-mes" height="600">
                  <el-table-column
                    label="参数项"
@@ -700,6 +710,7 @@
    return {
      paramMergeTemplate: '',
      itemKey: '',
      isShowTree: false,
      typeOptions: [],
      paramTemplateSelArr: [],
      paramTemplateSelCol: 'operationTemplateNo',
@@ -1073,6 +1084,13 @@
    },
    // 参数集模板点击事件
    templateRowClick(row) {
      if(this.isShowTree){
        this.isShowTree=false
      }else{
        this.isShowTree=true
      }
      console.log(this.isShowTree);
      this.paramData=[]
      this.getRoutingTemplateParam(row.id)
    },
    // 根据工艺、工序id、模板id去获取模板下的参数
@@ -1085,6 +1103,7 @@
        })
      ).then((response) => {
        if (response.data.data.length > 0) {
          this.paramData = []
          this.paramData = response.data.data
          this.paramMergeTemplate = 'paramMergeTemplate'
        } else {