Merge branch 'v2' of http://git.gdatac.com/hooloo/web/soss into v2

src/components/SelectCategory/index.vue

@@ -5,6 +5,8 @@
     @change="change"
     placeholder="请选择分类"
     clearable
+    :multiple="multiple"
+    :collapse-tags="collapseTags"
   >
     <el-option
       v-for="item in options"
@@ -21,7 +23,7 @@ import { getList } from "@/api/system/category";
 
 export default {
   name: "Class",
-  props: ["value"],
+  props: ["value","multiple","collapseTags"],
   model: {
     prop: "value",
     event: "input",

src/components/SelectGoods/index.vue

@@ -7,7 +7,7 @@
 					@keyup.enter.native="handleQuery" />
 			</el-form-item>
 			<el-form-item label="分类" prop="category">
-				<SelectCategory v-model="queryParams.category" placeholder="分类" />
+				<SelectCategory v-model="queryParams.category" placeholder="分类" :multiple="multiple" :collapseTags="collapseTags"/>
 			</el-form-item>
 			<el-form-item>
 				<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -69,7 +69,9 @@ export default {
 				state: 3,
         shopId: null
 			},
-      shopId: null
+      shopId: null,
+      multiple:false,
+      collapseTags:false
 		};
 	},
 	created() {

src/views/goods/goods/components/Form.vue

@@ -10,7 +10,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="分类" prop="category">
-              <SelectCategory v-model="form.category" />
+              <SelectCategory v-model="form.category" :multiple="multiple" :collapseTags="collapseTags"/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -223,7 +223,9 @@ export default {
       tagValues:"",
       goodsTagList: [],
       inputVisible: false,
-      inputValue: ''
+      inputValue: '',
+      multiple:true,
+      collapseTags:true
     };
   },
   methods: {

src/views/goods/goods/index.vue

@@ -15,7 +15,7 @@
       </el-select>
       </el-form-item>
       <el-form-item label="商品分类" prop="category">
-        <SelectCategory v-model="queryParams.category" />    
+        <SelectCategory v-model="queryParams.category" :multiple="multiple" :collapseTags="collapseTags"/>    
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery" v-hasPermi="['system:goods:query']">搜索</el-button>
@@ -144,7 +144,9 @@ export default {
           value: '5',
           label: '已删除'
       }],
-      categoryList:[]
+      categoryList:[],
+      multiple:false,
+      collapseTags:false
     };
   },
   created() {