Merge remote-tracking branch 'origin/master'

懒羊羊

2024-01-16 f1d9df303a33ef98066e4bf044b1114e1f3f629d

Merge remote-tracking branch 'origin/master'

 jcdm-main/src/main/java/com/jcdm/main/bs/material/service/IBsMaterialInfoService.java

@@ -5,7 +5,7 @@
import java.util.List;

/**
 * 物料信息Service接口
 * Service接口
 * 
 * @author yyt
 * @date 2023-12-09

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

@@ -148,29 +148,31 @@
          </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">

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

@@ -85,23 +85,23 @@
      <el-table-column type="selection" width="55" align="center" />
      <el-table-column label="物料编号"  align="center" prop="materialCode" width="180">
      </el-table-column>
      <el-table-column label="物料名称" align="center" prop="materialName" width="250">
      <el-table-column label="物料名称" align="center" prop="materialName" width="220">
      </el-table-column>
      <el-table-column label="视图" align="center" prop="materialView" width="180">
<!--      <el-table-column label="视图" align="center" prop="materialView" width="180">
      </el-table-column>-->

      <el-table-column label="车型" align="center" prop="carType" width="120">
      </el-table-column>
      <el-table-column label="特殊代码" align="center" prop="mark" width="180">
      </el-table-column>
      <el-table-column label="车型" align="center" prop="carType" width="180">
      </el-table-column>
      <el-table-column label="类型" align="center" prop="typeL">
      <el-table-column label="物料类型" align="center" prop="typeL">
        <template slot-scope="scope">
          <dict-tag :options="dict.type.material_type" :value="scope.row.typeL"/>
        </template>
      </el-table-column>

      <el-table-column label="型号" align="center" prop="typeZ" width="180">
      <el-table-column label="产品型号" align="center" prop="typeZ" width="150">
      </el-table-column>

      <el-table-column label="特殊代码" align="center" prop="mark" width="120">
      </el-table-column>
      <el-table-column label="单位" align="center" prop="unit" width="80">
        <template slot-scope="scope">
          <dict-tag :options="dict.type.unit" :value="scope.row.unit"/>