Merge branch 'dev' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into gyq

src/views/product/add_shop.vue

@@ -16,7 +16,7 @@
       <el-form-item label="商品名称" prop="name">
         <el-input v-model="form.name" placeholder="请输入商品名称" style="width: 500px;"></el-input>
       </el-form-item>
-      <el-form-item label="单位">
+      <el-form-item label="单位" prop="unitId">
         <el-select v-model="form.unitId" placeholder="请选择单位" style="width: 500px;" @change="selectUnitt">
           <el-option :label="item.name" :value="item.id" v-for="item in units" :key="item.id"></el-option>
         </el-select>
@@ -448,6 +448,11 @@ export default {
             message: "请输入商品名称"
           }
         ],
+        unitId: [{
+          required: true,
+          trigger: "change",
+          message: "请选择单位"
+        }],
         categoryId: [
           {
             required: true,