github/yudao-ui-admin-vue3
1
0
Fork 0
mirror of https://github.com/yudaocode/yudao-ui-admin-vue3.git synced 2026-04-19 13:18:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
YunaiV
2025-12-20 09:23:46 +08:00
parent b261ecf90f e3172065c8
commit 3648cf2e08
2 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/views/erp/purchase/in/components/PurchaseInItemForm.vue
View File

@@ -17,13 +17,7 @@
:rules="formRules.warehouseId" :rules="formRules.warehouseId"
class="mb-0px!" class="mb-0px!"
> >
<el-select <el-select v-model="row.warehouseId" clearable filterable placeholder="请选择仓库">
v-model="row.warehouseId"
clearable
filterable
placeholder="请选择仓库"
@change="onChangeWarehouse($event, row)"
>
<el-option <el-option
v-for="item in warehouseList" v-for="item in warehouseList"
:key="item.id" :key="item.id"

2
src/views/mall/product/spu/form/DescriptionForm.vue
View File

@@ -4,7 +4,7 @@
<!--富文本编辑器组件--> <!--富文本编辑器组件-->
<el-form-item label="商品详情" prop="description"> <el-form-item label="商品详情" prop="description">
<Editor v-if="!isDetail" v-model:modelValue="formData.description" /> <Editor v-if="!isDetail" v-model:modelValue="formData.description" />
<Editor :modelValue="formData.description" readonly /> <Editor v-else :modelValue="formData.description" readonly />
</el-form-item> </el-form-item>
</el-form> </el-form>
</template> </template>