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

zouyu

2023-11-10 65cd94b74a6dd5bae9bc2c3a98bc781d97099cb6

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

@@ -494,139 +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>
                    <!-- <paramMergeTemplate :key="isShowTree" :tableTreeData="paramData" :routingTemplateId="routingTemplateId"/> -->
                <component
                :is="paramMergeTemplate" 
                :key="isShowTree"
                :tableTreeData="paramData"
                :routingTemplateId="routingTemplateId"
                ></component> 
                </div>
                <!-- <paramMergeTemplate 
                :tableData="paramData"
                :page="{}"
                >
                </paramMergeTemplate> -->
                <!-- <component
                :is="paramMergeTemplate" 
                :key="isShowTree"
                :tableData="paramData"
                :routingTemplateId="routingTemplateId"
                ></component> -->
                <!-- <el-table :data="paramData" class="l-mes" height="600">
                  <el-table-column
                    label="参数项"
                    prop="parameterItem"
                    align="center"
                  >
                    <template slot-scope="scope">
                      <span
                        >{{ scope.row.parameterItem }}({{
                          scope.row.unit
                        }})</span
                    </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"
                      >
                    </template>
                  </el-table-column>
                  <el-table-column
                    label="参数类型"
                    prop="type"
                    align="center"
                    :formatter="getParam"
                  >
                  </el-table-column>
                  <el-table-column label="值" prop="paramValue" align="center">
                    <template slot-scope="scope">
                      <el-input
                        v-model="scope.row.paramValue"
                        placeholder="值"
                        :disabled="!editable"
                      ></el-input>
                    </template>
                  </el-table-column>
                  <el-table-column label="操作" align="center">
                    <template slot-scope="scope">
                      <el-button
                        type="text"
                        size="mini"
                        v-if="editable && routingTemplateId != null"
                        @click.stop="handleParamDelete(scope.row, scope.$index)"
                        >删除
                      </el-button>
                    </template>
                  </el-table-column>
                </el-table> -->
              </el-card>
                      </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>
@@ -1089,7 +1042,6 @@
      }else{
        this.isShowTree=true
      }
      console.log(this.isShowTree);
      this.paramData=[]
      this.getRoutingTemplateParam(row.id)
    },
@@ -1443,13 +1395,23 @@

    // 删除参数
    handleParamDelete(row, index) {
      this.$confirm('是否确认删除参数项为' + row.parameterItem, '提示', {
      this.$confirm('是否确认删除参数项为【' + row.paramItem +'】的数据?', '提示', {
        confirmButtonText: '确定',
        cancelButtonText: '取消',
        type: 'warning'
      })
        .then(function() {
          return deleteRoutingTemplateParam(row.id)
          let id = null
          if(row.treeId && row.treeId!='null'){
            id = row.treeId
          }else{
            if(row.twoId && row.twoId!='null'){
              id = row.twoId
            }else{
              id = row.oneId
            }
          }
          return deleteRoutingTemplateParam(id)
        })
        .then((response) => {
          const data = response.data
@@ -1643,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;