Merge remote-tracking branch 'origin/master'

src/views/erp/purchase/in/components/PurchaseInItemForm.vue

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

src/views/mall/product/spu/form/DescriptionForm.vue

@@ -4,7 +4,7 @@
     <!--富文本编辑器组件-->
     <el-form-item label="商品详情" prop="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>
 </template>