Merge remote-tracking branch 'origin/master'

hdy

2024-01-03 e0ef1ee0b9ade5847fc82c3a990b8acb85f6ec03

Merge remote-tracking branch 'origin/master'

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

@@ -163,6 +163,13 @@
          <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>
@@ -280,6 +287,7 @@
  name: "FormulaChild",
  data() {
    return {
      pjtUrl: process.env.VUE_APP_BASE_API,
      headerInformationData:{
        formulaCode: "",
        formulaName: "",