修改

src/views/exchangeManage/exchangeList.vue

@@ -13,6 +13,15 @@
             </el-select>
             <el-input clearable class="filter-item" style="width: 200px;" placeholder="活动标题"
                 v-model="listQuery.title"></el-input>
+                <el-select v-model="listQuery.productAttribute" clearable placeholder="商品属性" class="filter-item" style="width: 200px">
+                        <el-option :key="item.dictValue" v-for="item in productAttributeList" :label="item.dictLabel"
+                            :value="item.dictValue">
+                        </el-option>
+                    </el-select>
+            <el-select v-model="listQuery.deliveryType" clearable 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>
             <el-button class="filter-item" type="primary" v-waves icon="el-icon-search" @click="handleFilter">查找</el-button>
             <el-button class="filter-item" type="primary" v-waves icon="el-icon-download" @click="handleDownLoad">导出</el-button>
 
@@ -23,7 +32,7 @@
             highlight-current-row>
             <el-table-column type="index" label="序号" header-align="center" align="center">
             </el-table-column>
-            <el-table-column align="center" min-width="150px" label="部门名称" prop="deptName">
+            <el-table-column align="center" min-width="200px" label="部门名称" prop="deptName">
             </el-table-column>
             <el-table-column align="center" min-width="80px" label="员工名称" prop="purchaser">
             </el-table-column>
@@ -31,12 +40,18 @@
             </el-table-column>
             <el-table-column align="center" min-width="120px" label="订单状态" prop="orderTypeName">
             </el-table-column>
-            <el-table-column align="center" min-width="120px" label="商品名称" prop="name">
+            <el-table-column align="center" min-width="200px" label="商品名称" prop="name">
             </el-table-column>
             <el-table-column align="center" min-width="150px" label="商品编号" prop="skuSeq">
             </el-table-column>
             <el-table-column align="center" min-width="80px" label="商品类型" prop="skuTypeName">
             </el-table-column>
+            <el-table-column align="center" min-width="80px" label="商品属性" prop="productAttributeName">
+            </el-table-column>
+            <el-table-column align="center" min-width="150px" label="兑换方式" prop="deliveryTypeName">
+            </el-table-column>
+            <el-table-column align="center" min-width="80px" label="兑换数" prop="skuCount">
+            </el-table-column>
             <el-table-column align="center" min-width="80px" label="活动标题" prop="title">
             </el-table-column>
             <el-table-column align="center" label="操作" width="80px" class-name="small-padding fixed-width">
@@ -190,6 +205,7 @@
   
 <script>
 import { complete, list, detail } from "@/api/exchangeManage";
+import { dataTypeList } from "@/api/public";
 import waves from "@/directive/waves"; // 水波纹指令
 import Tinymce from '@/components/Tinymce'
 
@@ -199,6 +215,26 @@ export default {
     directives: { waves },
     data() {
         return {
+            productAttributeList: [],
+            deliveryTypeList: [
+            {
+                    type: 0,
+                    name: '办公室领取'
+                },
+                {
+                    type: 1,
+                    name: '快递'
+                },
+                {
+                    type: 2,
+                    name: '卷码兑换'
+                },
+                {
+                    type: 3,
+                    name: '线下组织'
+                },
+               
+            ],
             orderTypeList: [
                 {
                     orderType: 0,
@@ -234,6 +270,8 @@ export default {
                 orderSeq: '',
                 orderType: '',
                 title: '',
+                productAttribute:'',
+                deliveryType:'',
             },
             dialogVisible: false,
             dialogStatus: '',
@@ -245,9 +283,15 @@ export default {
         }
     },
     created() {
+        this.getProductAttributeList();
         this.getList();
     },
     methods: {
+        getProductAttributeList(){
+            dataTypeList({dictType:'mall_sku_attribute'}).then(response => {
+                this.productAttributeList = response.data.data;
+            }).catch(() => {});
+        },
         handleDownLoad(){
             window.location.href = process.env.BASE_API + '/mall-order/exportOrderLog?purchaser=' + this.listQuery.purchaser + '&orderSeq=' + this.listQuery.orderSeq + '&orderType=' + this.listQuery.orderType + '&title=' + this.listQuery.title;
         },

src/views/giftManage/giftList.vue

@@ -7,12 +7,19 @@
                 v-model="listQuery.name"></el-input>
             <el-input clearable class="filter-item" style="width: 200px;" placeholder="礼品编号"
                 v-model="listQuery.seq"></el-input>
-            <!-- <el-date-picker class="filter-item" v-model="listQuery.shelfTime" type="datetime" placeholder="礼品上架时间">
-            </el-date-picker> -->
             <el-select v-model="listQuery.status" clearable placeholder="状态" style="top: -4px;width: 200px;">
                 <el-option :key="item.type" v-for="item in goodsStatusList" :label="item.name" :value="item.type">
                 </el-option>
             </el-select>
+            <el-select v-model="listQuery.productAttribute" clearable placeholder="商品属性" class="filter-item" style="width: 200px">
+                        <el-option :key="item.dictValue" v-for="item in productAttributeList" :label="item.dictLabel"
+                            :value="item.dictValue">
+                        </el-option>
+                    </el-select>
+            <el-select v-model="listQuery.deliveryType" clearable 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>
             <el-button class="filter-item" type="primary" v-waves icon="el-icon-search" @click="handleFilter">查找</el-button>
             <el-button class="filter-item" type="primary" @click="handleCreate" icon="el-icon-edit">添加</el-button>
 
@@ -24,7 +31,7 @@
             <el-table-column type="index" label="序号" header-align="center" align="center">
             </el-table-column>
 
-            <el-table-column align="center" min-width="100px" label="礼品名称" prop="name">
+            <el-table-column align="center" min-width="200px" label="礼品名称" prop="name">
             </el-table-column>
 
             <el-table-column align="center" min-width="120px" label="礼品编号" prop="seq">
@@ -32,22 +39,14 @@
 
             <el-table-column align="center" min-width="80px" label="礼品属性" prop="productAttributeName">
             </el-table-column>
-            <!-- <el-table-column align="center" min-width="80px" label="积分" prop="integral">
-            </el-table-column> -->
             <el-table-column align="center" min-width="100px" label="库存量" prop="actualStock">
             </el-table-column>
             <el-table-column align="center" min-width="100px" label="可兑换库存量" prop="stock">
             </el-table-column>
-            <el-table-column align="center" min-width="80px" label="兑换方式">
-                <template slot-scope="props">
-                    <span v-if="props.row.deliveryType == 1">快递</span>
-                    <span v-if="props.row.deliveryType == 0">无需快递</span>
-                </template>
+            <el-table-column align="center" min-width="150px" label="兑换方式" prop="deliveryName">
             </el-table-column>
             <el-table-column align="center" min-width="100px" label="礼品所在地" prop="location">
             </el-table-column>
-            <!-- <el-table-column align="center" min-width="150px" label="上架时间" prop="shelfTime">
-            </el-table-column> -->
             <el-table-column align="center" min-width="80px" label="礼品状态">
                 <template slot-scope="props">
                     <span v-if="props.row.status == 1">上架</span>
@@ -236,7 +235,7 @@ export default {
             locationList:[],
             productAttributeList: [],
             deliveryTypeList: [
-                {
+            {
                     type: 0,
                     name: '办公室领取'
                 },
@@ -248,6 +247,10 @@ export default {
                     type: 2,
                     name: '卷码兑换'
                 },
+                {
+                    type: 3,
+                    name: '线下组织'
+                },
                
             ],
             goodsStatusList: [
@@ -274,8 +277,9 @@ export default {
                 limit: 10,
                 name: '',
                 seq: '',
-                shelfTime: '',
                 status: '',
+                productAttribute:'',
+                deliveryType:'',
             },
             itemListQuery: {
                 page: 1,
@@ -476,7 +480,27 @@ export default {
             this.dataForm = Object.assign({}, row);
             this.dataForm.productAttribute = row.productAttribute.toString();
             let comment = this.dataForm.comment;
-            if (row.productAttribute == 1) {
+            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,
@@ -484,14 +508,23 @@ export default {
                     },
                     {
                         type: 0,
-                        name: '无需快递'
+                        name: '办公室领取'
+                    },
+                ]
+            } 
+            if (val == 2 || val == 3)  {
+                this.deliveryTypeList = [
+                    {
+                        type: 2,
+                        name: '卷码兑换'
                     },
                 ]
-            } else {
+            }
+            if (val == 5)  {
                 this.deliveryTypeList = [
                     {
-                        type: 0,
-                        name: '无需快递'
+                        type: 3,
+                        name: '线下组织'
                     },
                 ]
             }

src/views/goodsManage/goodsList.vue

@@ -7,12 +7,19 @@
                 v-model="listQuery.name"></el-input>
             <el-input clearable class="filter-item" style="width: 200px;" placeholder="商品编号"
                 v-model="listQuery.seq"></el-input>
-            <!-- <el-date-picker class="filter-item" v-model="listQuery.shelfTime" type="datetime" placeholder="商品上架时间">
-            </el-date-picker> -->
-            <el-select v-model="listQuery.status" clearable placeholder="状态" style="top: -4px;width: 200px;">
+            <el-select v-model="listQuery.status" clearable placeholder="状态" class="filter-item" style="width: 200px;">
                 <el-option :key="item.type" v-for="item in goodsStatusList" :label="item.name" :value="item.type">
                 </el-option>
             </el-select>
+            <el-select v-model="listQuery.productAttribute" clearable placeholder="商品属性" class="filter-item" style="width: 200px">
+                        <el-option :key="item.dictValue" v-for="item in productAttributeList" :label="item.dictLabel"
+                            :value="item.dictValue">
+                        </el-option>
+                    </el-select>
+            <el-select v-model="listQuery.deliveryType" clearable 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>
             <el-button class="filter-item" type="primary" v-waves icon="el-icon-search" @click="handleFilter">查找</el-button>
             <el-button class="filter-item" type="primary" @click="handleCreate" icon="el-icon-edit">添加</el-button>
 
@@ -38,13 +45,7 @@
             </el-table-column>
             <el-table-column align="center" min-width="100px" label="可兑换库存量" prop="stock">
             </el-table-column>
-            
-            <el-table-column align="center" min-width="80px" label="兑换方式">
-                <template slot-scope="props">
-                    <span v-if="props.row.deliveryType == 1">快递</span>
-                    <span v-if="props.row.deliveryType == 0">办公室领取</span>
-                    <span v-if="props.row.deliveryType == 2">卷码兑换</span>
-                </template>
+            <el-table-column align="center" min-width="150px" label="兑换方式" prop="deliveryName">
             </el-table-column>
             <el-table-column align="center" min-width="100px" label="商品所在地" prop="location">
             </el-table-column>
@@ -221,7 +222,7 @@ export default {
             locationList:[],
             productAttributeList: [],
             deliveryTypeList: [
-                {
+            {
                     type: 0,
                     name: '办公室领取'
                 },
@@ -233,6 +234,10 @@ export default {
                     type: 2,
                     name: '卷码兑换'
                 },
+                {
+                    type: 3,
+                    name: '线下组织'
+                },
                
             ],
             goodsStatusList: [
@@ -258,6 +263,8 @@ export default {
                 name: '',
                 seq: '',
                 status: '',
+                productAttribute:'',
+                deliveryType:'',
             },
             itemListQuery: {
                 page: 1,
@@ -308,6 +315,7 @@ export default {
             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 = [
@@ -446,7 +454,27 @@ export default {
             this.dataForm = Object.assign({}, row);
             this.dataForm.productAttribute = row.productAttribute.toString();
             let comment = this.dataForm.comment;
-            if (row.productAttribute == 1) {
+            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,
@@ -457,11 +485,20 @@ export default {
                         name: '办公室领取'
                     },
                 ]
-            } else {
+            } 
+            if (val == 2 || val == 3)  {
+                this.deliveryTypeList = [
+                    {
+                        type: 2,
+                        name: '卷码兑换'
+                    },
+                ]
+            }
+            if (val == 5)  {
                 this.deliveryTypeList = [
                     {
-                        type: 0,
-                        name: '办公室领取'
+                        type: 3,
+                        name: '线下组织'
                     },
                 ]
             }