添加修改产品规划

enterprise-manager-ui/admin/src/views/product/drawershow.vue

@@ -5,20 +5,25 @@
             :visible.sync="open"
             :direction="direction"
             :destroy-on-close="true"
-            size="50%">
+            size="90%">
         <el-form ref="form" :model="form" :rules="rules" label-width="120px">
             <el-row>
-                                            <Field label="产品名称，名称唯一" prop="productName" v-model="form.productName" placeholder="请输入产品名称，名称唯一"/>
+              <Field label="产品名称" prop="productName" v-model="form.productName" placeholder="请输入产品名称，名称唯一"/>
                             <Field label="产品编码" prop="productCode" v-model="form.productCode" type="textarea" placeholder="请输入产品编码"/>
                             <Field label="产品slogan" prop="productSlogan" v-model="form.productSlogan" placeholder="请输入产品slogan"/>
-                            <Field label="产品图标"><imageUpload v-model="form.productLogoPath" prePath="/file/preview"/></Field>
+
+              <Field label="产品分类" prop="categoryId" v-model="form.categoryId" :multiple="true" type="select" placeholder="请选择产品分类"/>
+              <Field label="所属企业" prop="companyId" v-model="form.companyId" :multiple="true" type="select" placeholder="请选择所属企业"/>
+
+
+              <Field label="产品图标"><imageUpload v-model="form.productLogoPath" prePath="/file/preview"/></Field>
                             <Field label="产品封面图片" prop="productFacePath" v-model="form.productFacePath" placeholder="请输入产品封面图片"/>
-                            <Field label="产品视频,多个视频逗号分割"><fileUpload v-model="form.productVideoPath"  prePath="/file/fileupload"/></Field>
-                            <Field label="产品宣传图片,多个视频逗号分割"><imageUpload v-model="form.productPicPath" prePath="/file/preview"/></Field>
+                            <Field label="产品视频"><fileUpload v-model="form.productVideoPath"  prePath="/file/fileupload"/></Field>
+                            <Field label="产品宣传图片"><imageUpload v-model="form.productPicPath" prePath="/file/preview"/></Field>
                             <Field label="产品介绍" prop="productIntroduction" v-model="form.productIntroduction" type="textarea" placeholder="请输入产品介绍"/>
                             <Field label="产品详情" prop="productDetail" v-model="form.productDetail" type="textarea" placeholder="请输入产品详情"/>
                             <Field label="发布时间" prop="publishTime" v-model="form.publishTime" type="date" />
-                            <Field label="是否热门" prop="hot" v-model="form.hot" type="select" :enumData="dict.hot" placeholder="请选择是否热门"/>
+                            <Field label="热门" prop="hot" v-model="form.hot" type="radio" :enumData="dict.hot" placeholder="请选择是否热门"/>
                             <Field label="备注" prop="productRemark" v-model="form.productRemark" type="textarea" placeholder="请输入备注"/>
 
             </el-row>

enterprise-manager/src/main/java/com/mortals/xhx/module/product/model/vo/ProductVo.java

@@ -20,9 +20,9 @@ public class ProductVo extends BaseEntityLong {
     private List <Long> idList;
 
 //所属公司
-    private String companyIds;
+    private String companyId;
 //所属企业
-    private String categoryIds;
+    private String categoryId;
 
 
 }
\ No newline at end of file

enterprise-manager/src/main/java/com/mortals/xhx/module/product/service/impl/ProductServiceImpl.java

@@ -51,8 +51,8 @@ public class ProductServiceImpl extends AbstractCRUDServiceImpl<ProductDao, Prod
         list.forEach(item->{
             String categoryIds = productCategoryService.find(new ProductCategoryQuery().productId(item.getId())).stream().map(i -> i.getCategoryId().toString()).collect(Collectors.joining(","));
             String companyIds = companyProductService.find(new CompanyProductQuery().productId(item.getId())).stream().map(i -> i.getProductId().toString()).collect(Collectors.joining(","));
-            item.setCompanyIds(companyIds);
-            item.setCategoryIds(categoryIds);
+            item.setCompanyId(companyIds);
+            item.setCategoryId(categoryIds);
         });
     }