Merge remote-tracking branch 'origin/master'

cl

2024-01-18 d18622be3bf4c48e9cf17bc4d3254245438ed272

 jcdm-ui/src/views/main/bs/formulaChild/index.vue

@@ -148,34 +148,36 @@
          </el-table-column>
          <el-table-column label="产品编号" width="150" align="center" prop="productCode">
          </el-table-column>
          <el-table-column label="操作内容" :show-overflow-tooltip='true' width="150" align="center" prop="operationSteps">
<!--          <el-table-column label="操作内容" :show-overflow-tooltip='true' width="150" align="center" prop="operationSteps">
          </el-table-column>-->
          <el-table-column label="排序" width="90" align="center" prop="stepSort">
          </el-table-column>
          <el-table-column label="技术要求" width="150" :show-overflow-tooltip='true' align="center" prop="techRequirement">
          <el-table-column label="技术要求" width="380" :show-overflow-tooltip='true' align="center" prop="techRequirement">
          </el-table-column>
          <el-table-column label="图片" :show-overflow-tooltip='true' width="130" align="center" prop="picture">
            <!--            <template slot-scope="scope">-->
            <!--              <el-image-->
            <!--                style="width: 100px; height: 100px"-->
            <!--                :src="pjtUrl+scope.row.picture"-->
            <!--                :fit="fit">-->
            <!--              </el-image>-->
            <!--            </template>-->
          </el-table-column>
          <el-table-column label="类型" width="90" align="center" prop="operationType">
          </el-table-column>
          <el-table-column label="排序" width="90" align="center" prop="stepSort">
          </el-table-column>

          <el-table-column label="参数编码" width="130" align="center" prop="paramCode">
          </el-table-column>
          <el-table-column label="物料编码" width="130" align="center" prop="materialCode">
          </el-table-column>
          <el-table-column label="配方编码" width="130" align="center" prop="formulaCode">
          </el-table-column>
          <el-table-column label="图片" :show-overflow-tooltip='true' width="130" align="center" prop="picture">
<!--            <template slot-scope="scope">-->
<!--              <el-image-->
<!--                style="width: 100px; height: 100px"-->
<!--                :src="pjtUrl+scope.row.picture"-->
<!--                :fit="fit">-->
<!--              </el-image>-->
<!--            </template>-->
          </el-table-column>

          <el-table-column label="备注" width="130" align="center" prop="remarks">
          </el-table-column>
          <el-table-column label="创建用户" width="130" align="center" prop="createUser">
          </el-table-column>
          <el-table-column label="创建时间" width="150" align="center" prop="createTime">
          <el-table-column label="创建时间" width="160" align="center" prop="createTime">
          </el-table-column>
          <el-table-column label="更改用户" width="130" align="center" prop="updateUser">
          </el-table-column>
@@ -366,6 +368,7 @@
    let formulaCode = this.$route.query.formulaCode;
    this.queryParams.formulaCode = formulaCode;
    this.formulaCode = formulaCode;
    this.form.formulaCode = formulaCode;
    this.headerInformation();
    this.getList();
  },