From adf950ae62934bde318e420d770b144208188799 Mon Sep 17 00:00:00 2001
From: zhaochencheng <zccbbg@qq.com>
Date: Wed, 4 Jan 2023 11:33:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E6=9C=AC=E4=BF=A1=E6=81=AF=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/components/BrandSelect.vue |  2 +-
 src/views/pms/product/AddProduct.vue | 83 ++++++++++++++++++----------
 2 files changed, 56 insertions(+), 29 deletions(-)

diff --git a/src/views/components/BrandSelect.vue b/src/views/components/BrandSelect.vue
index 8ce6046..6a7e6db 100644
--- a/src/views/components/BrandSelect.vue
+++ b/src/views/components/BrandSelect.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-select v-model="value1" placeholder="选择品牌" ref="brandSelect" @change="handleBrandChange">
+  <el-select v-model="value1" placeholder="选择品牌" ref="brandSelect" @change="handleBrandChange" clearable>
     <el-option v-for="it in options" :key="it.id" :value="it.id" :label="it.name">{{it.name}}</el-option>
   </el-select>
 </template>
diff --git a/src/views/pms/product/AddProduct.vue b/src/views/pms/product/AddProduct.vue
index 91e157e..81fe0c6 100644
--- a/src/views/pms/product/AddProduct.vue
+++ b/src/views/pms/product/AddProduct.vue
@@ -5,34 +5,60 @@
         <div slot="header">
           <span>基本信息</span>
         </div>
-        <el-form-item label="商品名称" prop="name">
-          <el-input v-model="form.name" placeholder="请输入商品名称"></el-input>
-        </el-form-item>
-        <el-form-item label="商品编码" prop="outProductId">
-          <el-input v-model="form.outProductId" placeholder="请输入商品编码"></el-input>
-        </el-form-item>
-        <el-form-item label="品牌" prop="brandId">
-          <brand-select v-model="form.brandId" @change="onBrandChange"></brand-select>
-        </el-form-item>
-        <el-form-item label="分类" prop="categoryId">
-          <product-category-select class="w200" v-model="form.categoryId" @change="categoryChange"></product-category-select>
-        </el-form-item>
-        <el-form-item label="上架状态">
-          <DictRadio v-model="form.publishStatus" size="small"
-                    :radioData="dict.type.pms_publish_status"/>
-        </el-form-item>
-        <el-form-item label="排序" prop="sort">
-          <el-input v-model="form.sort" placeholder="请输入排序"></el-input>
-        </el-form-item>
-        <el-form-item label="价格" prop="price">
-          <el-input v-model="form.price" placeholder="请输入PRICE"></el-input>
-        </el-form-item>
-        <el-form-item label="单位" prop="unit">
-          <el-input v-model="form.unit" placeholder="请输入单位"></el-input>
-        </el-form-item>
-        <el-form-item label="商品重量" prop="weight">
-          <el-input v-model="form.weight" placeholder="商品重量，默认为克"></el-input>
-        </el-form-item>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="商品名称" prop="name">
+              <el-input v-model="form.name" placeholder="请输入商品名称"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="商品编码" prop="outProductId">
+              <el-input v-model="form.outProductId" placeholder="请输入商品编码"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="品牌" prop="brandId">
+              <brand-select v-model="form.brandId" @change="onBrandChange"></brand-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="分类" prop="categoryId">
+              <product-category-select v-model="form.categoryId" @change="categoryChange"></product-category-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="排序" prop="sort">
+              <el-input v-model="form.sort" placeholder="请输入排序"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="价格" prop="price">
+              <el-input v-model="form.price" placeholder="请输入PRICE"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="单位" prop="unit">
+              <el-input v-model="form.unit" placeholder="请输入单位"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="商品重量" prop="weight">
+              <el-input v-model="form.weight" placeholder="商品重量，默认为克"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="上架状态">
+              <DictRadio v-model="form.publishStatus" size="small"
+                        :radioData="dict.type.pms_publish_status"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-card>
 
       <el-card style="margin: 20px 20px; font-size: 14px">
@@ -156,6 +182,7 @@ export default {
     if (id) {
       this.getInfo(id);
     }else{
+      this.form.sort=1000
       this.form.publishStatus=0
     }
   },