修改

src/views/goodsManage/goodsList.vue

@@ -16,7 +16,7 @@
                             :value="item.dictValue">
                         </el-option>
                     </el-select>
-            <el-select v-model="listQuery.deliveryType" clearable placeholder="兑换方式" class="filter-item" style="width: 200px">
+            <el-select v-model="listQuery.deliveryTypes" multiple filterable placeholder="兑换方式" class="filter-item" style="width: 200px">
                         <el-option :key="item.type" v-for="item in deliveryTypeList" :label="item.name" :value="item.type">
                         </el-option>
             </el-select>
@@ -45,10 +45,8 @@
             </el-table-column>
             <el-table-column align="center" min-width="100px" label="可兑换库存量" prop="stock">
             </el-table-column>
-            <el-table-column align="center" min-width="150px" label="兑换方式" prop="deliveryTypeName">
-            </el-table-column>
-            <el-table-column align="center" min-width="100px" label="商品所在地" prop="location">
-            </el-table-column>
+            <!-- <el-table-column align="center" min-width="100px" label="商品所在地" prop="location">
+            </el-table-column> -->
             <el-table-column align="center" min-width="80px" label="商品状态">
                 <template slot-scope="props">
                     <span v-if="props.row.status == 1">上架</span>
@@ -104,8 +102,6 @@
                 </el-table-column>
                 <el-table-column align="center" label="员工姓名" prop="purchaser">
                 </el-table-column>
-                <el-table-column align="center" label="兑换方式" prop="deliveryTypeName">
-                </el-table-column>
                 <el-table-column align="center" label="兑换数量" prop="skuCount">
                 </el-table-column>
                 <el-table-column align="center" label="联系人" prop="contact">
@@ -114,8 +110,8 @@
                 </el-table-column>
                 <el-table-column align="center" width="200px" label="地址" prop="contactAddr">
                 </el-table-column>
-                <el-table-column align="center" width="200px" label="邮箱" prop="contactEmail">
-                </el-table-column>
+                <!-- <el-table-column align="center" width="200px" label="邮箱" prop="contactEmail">
+                </el-table-column> -->
                 <el-table-column align="center" width="150px" label="兑换时间" prop="createTime">
                 </el-table-column>
         </el-table>
@@ -147,18 +143,18 @@
                         </el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item label="兑换方式" prop="deliveryType">
-                    <el-select v-model="dataForm.deliveryType" filterable placeholder="请选择" style="width: 350px">
-                        <el-option :key="item.type" v-for="item in deliveryTypeList" :label="item.name" :value="item.type">
+                <el-form-item label="兑换方式" prop="deliveryTypes">
+                    <el-select v-model="dataForm.deliveryTypes" multiple filterable placeholder="请选择" style="width: 350px">
+                        <el-option :key="item.dictValue" v-for="item in deliveryTypeList" :label="item.dictLabel" :value="item.dictValue">
                         </el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item v-if="dataForm.deliveryType==0" label="商品所在地" prop="location">
+                <!-- <el-form-item v-if="dataForm.deliveryTypes==0" label="商品所在地" prop="location">
                     <el-select v-model="dataForm.location" filterable placeholder="请选择" style="width: 350px">
                         <el-option :key="item.dictLabel" v-for="item in locationList" :label="item.dictLabel" :value="item.dictLabel">
                         </el-option>
                     </el-select>
-                </el-form-item>
+                </el-form-item> -->
                 <el-form-item style="width: 800px" label="商品图片" prop="imgUrl">
                     <el-upload :limit="1" :action="fileImgUrl" list-type="picture-card" :file-list="dataForm.images"
                             :on-success="handleGallerySucess" :on-exceed="handleExceed" :before-upload="uploadBannerImg"
@@ -221,25 +217,7 @@ export default {
         return {
             locationList:[],
             productAttributeList: [],
-            deliveryTypeList: [
-            {
-                    type: 0,
-                    name: '办公室领取'
-                },
-                {
-                    type: 1,
-                    name: '快递'
-                },
-                {
-                    type: 2,
-                    name: '卷码兑换'
-                },
-                {
-                    type: 3,
-                    name: '线下组织'
-                },
-               
-            ],
+            deliveryTypeList: [],
             goodsStatusList: [
                 {
                     type: 1,
@@ -264,7 +242,6 @@ export default {
                 seq: '',
                 status: '',
                 productAttribute:'',
-                deliveryType:'',
             },
             itemListQuery: {
                 page: 1,
@@ -280,8 +257,8 @@ export default {
                 imgUrl: undefined,
                 price: undefined,
                 actualStock: undefined,
-                deliveryType: undefined,
-                location: undefined,
+                deliveryTypes: [],
+                // location: undefined,
                 images: [],
             },
             dialogFormVisible: false,
@@ -296,8 +273,8 @@ export default {
                 productAttribute: [{ required: true, message: "请选择商品属性", trigger: "blur" }],
                 price: [{ required: true, message: "请填写商品积分", trigger: "blur" }],
                 actualStock: [{ required: true, message: "请设置库存量", trigger: "blur" }],
-                deliveryType: [{ required: true, message: "请选择兑换方式", trigger: "blur" }],
-                location: [{ required: true, message: "请选择商品所在地", trigger: "blur" }],
+                deliveryTypes: [{ required: true, message: "请选择兑换方式", trigger: "blur" }],
+                // location: [{ required: true, message: "请选择商品所在地", trigger: "blur" }],
                 comment: [{ required: true, message: "说明不能为空", trigger: "blur" }],
             },
             dialogListVisible: false,
@@ -311,60 +288,19 @@ export default {
         this.getList();
     },
     methods: {
+        getDeliveryTypeList(val){
+            dataTypeList({dictType:val}).then(response => {
+                this.deliveryTypeList = response.data.data;
+            });
+        },
         handleDownLoad(){
             window.location.href = process.env.BASE_API + '/mall-sku/exportSkuLog?skuId=' + this.itemListQuery.skuId + '&deptId=' + this.itemListQuery.deptId + '&userName=' + this.itemListQuery.userName;
         },
         changeProductAttribute(val) {
             debugger
-            this.dataForm.deliveryType = undefined;
-            this.dataForm.location = undefined;
-            this.deliveryTypeList = [
-                {
-                    type: 0,
-                    name: '办公室领取'
-                },
-                {
-                    type: 1,
-                    name: '快递'
-                },
-                {
-                    type: 2,
-                    name: '卷码兑换'
-                },
-                {
-                    type: 3,
-                    name: '线下组织'
-                },
-               
-            ];
-            if (val == 1) {
-                this.deliveryTypeList = [
-                    {
-                        type: 1,
-                        name: '快递'
-                    },
-                    {
-                        type: 0,
-                        name: '办公室领取'
-                    },
-                ]
-            } 
-            if (val == 2 || val == 3)  {
-                this.deliveryTypeList = [
-                    {
-                        type: 2,
-                        name: '卷码兑换'
-                    },
-                ]
-            }
-            if (val == 5)  {
-                this.deliveryTypeList = [
-                    {
-                        type: 3,
-                        name: '线下组织'
-                    },
-                ]
-            }
+            this.dataForm.deliveryTypes = [];
+            // this.dataForm.location = undefined;
+            this.getDeliveryTypeList(val);
         },
         handleRemove(file, fileList) {
             console.log(file, fileList);
@@ -413,8 +349,8 @@ export default {
                 imgUrl: undefined,
                 price: undefined,
                 actualStock: undefined,
-                deliveryType: undefined,
-                location: undefined,
+                deliveryTypes: [],
+                // location: undefined,
                 images: [],
             };
         },
@@ -455,53 +391,7 @@ export default {
             this.dataForm.productAttribute = row.productAttribute.toString();
             let comment = this.dataForm.comment;
             let val = row.productAttribute;
-            this.deliveryTypeList = [
-                {
-                    type: 0,
-                    name: '办公室领取'
-                },
-                {
-                    type: 1,
-                    name: '快递'
-                },
-                {
-                    type: 2,
-                    name: '卷码兑换'
-                },
-                {
-                    type: 3,
-                    name: '线下组织'
-                },
-               
-            ];
-            if (val == 1) {
-                this.deliveryTypeList = [
-                    {
-                        type: 1,
-                        name: '快递'
-                    },
-                    {
-                        type: 0,
-                        name: '办公室领取'
-                    },
-                ]
-            } 
-            if (val == 2 || val == 3)  {
-                this.deliveryTypeList = [
-                    {
-                        type: 2,
-                        name: '卷码兑换'
-                    },
-                ]
-            }
-            if (val == 5)  {
-                this.deliveryTypeList = [
-                    {
-                        type: 3,
-                        name: '线下组织'
-                    },
-                ]
-            }
+            this.getDeliveryTypeList(val);
             if (this.dataForm.imgUrl) {
                 let images = this.dataForm.imgUrl.split(",");
                 this.dataForm.images = [];