src/views/warehouseManagement/index.vue
@@ -163,7 +163,7 @@ </template> </el-dialog> <!-- 合并数据弹框 --> <el-dialog title="合并库存" v-model="mergeVisible" width="800px"> <el-dialog :title="operationType.value === 'edit' ? '编辑库存' : '合并库存'" v-model="mergeVisible" width="800px"> <el-form :model="mergeForm" :rules="mergeRules" ref="mergeRef" label-width="100px"> <el-row> <el-col :span="12">