1.【兑换管理】新增联系人、联系电话查询条件

2.【点赞列表】新增字段：事项、奖励积分
3.【兑换管理】导出模板新增领取办公室
4. 优化【首页轮播图】上传功能

src/views/dictManage/dictDataList.vue

@@ -73,7 +73,17 @@
               <el-input style="width: 300px" v-model="dataForm.dictLabel"></el-input>
             </el-form-item>
             <el-form-item  label="字典键值" prop="dictValue">
-              <el-input style="width: 300px" v-model="dataForm.dictValue"></el-input>
+               <el-upload  v-if="dataForm.dictType === 'index_lbt'"
+                            :limit="1" :action="fileImgUrl"
+                            list-type="picture-card"
+                            :file-list="dataForm.images"
+                            :on-success="handleGallerySucess"
+                            :on-exceed="handleExceed"
+                            :before-upload="uploadBannerImg"
+                            :on-remove="handleRemove">
+                             <i class="el-icon-plus"></i>
+              </el-upload>
+              <el-input  v-else style="width: 300px" v-model="dataForm.dictValue"></el-input>
             </el-form-item>
             <el-form-item label="显示排序" prop="dictSort">
                 <el-input-number
@@ -91,8 +101,8 @@
             <el-form-item  label="备注">
               <el-input type="textarea" :rows="2" style="width: 300px" v-model="dataForm.remark"></el-input>
             </el-form-item>
-            
-            
+
+
         </el-form>
         <div slot="footer" class="dialog-footer">
           <el-button @click="dialogFormVisible = false">取消</el-button>
@@ -103,7 +113,7 @@
 
     </div>
 </template>
-  
+
 <style>
 .demo-table-expand {
     font-size: 0;
@@ -119,7 +129,7 @@
     margin-bottom: 0;
 }
 </style>
-  
+
 <script>
 import { dataList, dataAdd, dataEdit, dataRemove, optionSelect } from "@/api/dictManage";
 import waves from "@/directive/waves"; // 水波纹指令
@@ -158,7 +168,8 @@ export default {
             dataForm: {
                 dictType: undefined,
                 dictLabel: undefined,
-                dictValue: undefined,
+                dictValue: '',
+                images: [],
                 dictSort: undefined,
                 status: '0',
                 remark: undefined,
@@ -174,7 +185,9 @@ export default {
                 dictLabel: [{ required: true, message: "字典标签不能为空", trigger: "blur" }],
                 dictValue: [{ required: true, message: "字典键值不能为空", trigger: "blur" }],
                 dictSort: [{ required: true, message: "显示排序不能为空", trigger: "blur" }],
+
             },
+            fileImgUrl: this.upLoadUrl,
         }
     },
     created() {
@@ -182,6 +195,7 @@ export default {
         this.getOptionSelect();
     },
     methods: {
+
         changeDictType(val){
             this.dictType = val;
             this.listQuery.dictType = val;
@@ -198,7 +212,8 @@ export default {
             this.dataForm = {
                 dictType: undefined,
                 dictLabel: undefined,
-                dictValue: undefined,
+                dictValue: '',
+                images: [],
                 dictSort: undefined,
                 status: '0',
                 remark: undefined,
@@ -262,6 +277,20 @@ export default {
 
         handleUpdate(row) {
             this.dataForm = Object.assign({}, row);
+            if (this.dataForm.dictValue) {
+                            let images = this.dataForm.dictValue.split(",");
+                            this.dataForm.images = [];
+                            for (let i in images) {
+                                let url = images[i];
+                                let name = "image_" + i;
+
+                                this.dataForm.images.push({
+                                    name: name,
+                                    url: url,
+                                    response: { error: "0", data: { url: url } },
+                                });
+                            }
+                        }
             this.dialogStatus = 'update'
             this.dialogFormVisible = true
             this.$nextTick(() => {
@@ -347,6 +376,44 @@ export default {
         handleSelectionChange(val) {
             this.multipleSelection = val;
         },
+        uploadBannerImg(file) {
+                    const isJPGs = file.type === "image/jpeg";
+                    console.log(isJPGs);
+                },
+        handleExceed(files, fileList) {
+                    this.$message.warning(
+                        `当前限制选择 1 个文件，本次选择了 ${files.length} 个文件！，共选择了 ${files.length + fileList.length
+                        } 个文件`
+                    );
+                },
+        handleGallerySucess(res, file, fileList) {
+                    this.dataForm.dictValue = ""; // 清空画廊图片数组
+
+                    let images = [];
+                    for (let i in fileList) {
+                        let response = fileList[i].response;
+                        if (response.errno && response.errno != "0") {
+                            this.$message.error("该图片上传失败,已被移除,请重新上传!");
+                            // 上传失败移除该 file 对象
+                            fileList.splice(i, 1);
+                        } else {
+                            let url = response.data.url;
+                            images.push(url);
+                        }
+                    }
+
+                    this.dataForm.dictValue = images.join(",");
+                },
+                handleRemove(file, fileList) {
+                            console.log(file, fileList);
+                            let images = [];
+                            for (let i in fileList) {
+                                let response = fileList[i].response;
+                                let url = response.data.url;
+                                images.push(url);
+                                this.dataForm.dictValue = images.join(",");
+                            }
+                        },
     }
 }
 </script>
@@ -376,4 +443,3 @@ export default {
     display: block;
 }
 </style>
-  

src/views/exchangeManage/approvalList.vue

@@ -18,6 +18,10 @@
                         <el-option :key="item.dictValue" v-for="item in deliveryTypeList" :label="item.dictLabel" :value="item.dictValue">
                         </el-option>
             </el-select>
+             <el-input clearable class="filter-item" style="width: 200px;" placeholder="联系人"
+                                       v-model="listQuery.contact"></el-input>
+                        <el-input clearable class="filter-item" style="width: 200px;" placeholder="联系电话"
+                                       v-model="listQuery.contactPhone"></el-input>
             <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>
             <el-button class="filter-item" type="primary" v-waves icon="el-icon-upload2" @click="handleUpload">批量导入审批</el-button>
@@ -83,10 +87,10 @@
         <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogVisible" :close-on-click-modal="false" width="70%">
 
             <h3>订单信息</h3>
-            
+
             <el-form status-icon label-position="center" label-width="100px" style="width:100%;">
                 <div style="display: flex;">
-                    
+
                     <el-form-item label="订单编号">
                         <el-input disabled v-model="detailData.orderSeq"></el-input>
                     </el-form-item>
@@ -165,8 +169,8 @@
                     <el-form-item label="采购单价">
                         <el-input v-model="detailData.nowPrice"></el-input>
                     </el-form-item>
-                    
-                    
+
+
                 </div>
 
                 <el-form-item label="备注">
@@ -211,7 +215,7 @@
 
     </div>
 </template>
-  
+
 <style>
 .demo-table-expand {
     font-size: 0;
@@ -227,7 +231,7 @@
     margin-bottom: 0;
 }
 </style>
-  
+
 <script>
 import axios from 'axios';
 import { getToken } from '@/utils/auth'
@@ -298,7 +302,7 @@ export default {
                 }else{
                     this.$message.error(res.errmsg);
                 }
-                
+
             })
             this.getList();
             this.uploadVisible = false;
@@ -354,7 +358,7 @@ export default {
                 })
                 .catch(() => { });
             }
-            
+
         },
         getDetail(id) {
             detail({ orderId: id }).then(response => {
@@ -421,4 +425,3 @@ export default {
     padding-top: 0px;
 }
 </style>
-  

src/views/exchangeManage/cancelledList.vue

@@ -18,6 +18,10 @@
                         <el-option :key="item.dictValue" v-for="item in deliveryTypeList" :label="item.dictLabel" :value="item.dictValue">
                         </el-option>
             </el-select>
+             <el-input clearable class="filter-item" style="width: 200px;" placeholder="联系人"
+                                       v-model="listQuery.contact"></el-input>
+                        <el-input clearable class="filter-item" style="width: 200px;" placeholder="联系电话"
+                                       v-model="listQuery.contactPhone"></el-input>
             <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>
 
@@ -80,10 +84,10 @@
         <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogVisible" :close-on-click-modal="false" width="70%">
 
             <h3>订单信息</h3>
-            
+
             <el-form status-icon label-position="center" label-width="100px" style="width:100%;">
                 <div style="display: flex;">
-                    
+
                     <el-form-item label="订单编号">
                         <el-input disabled v-model="detailData.orderSeq"></el-input>
                     </el-form-item>
@@ -189,7 +193,7 @@
 
     </div>
 </template>
-  
+
 <style>
 .demo-table-expand {
     font-size: 0;
@@ -205,7 +209,7 @@
     margin-bottom: 0;
 }
 </style>
-  
+
 <script>
 import { complete, list, detail } from "@/api/exchangeManage";
 import { dataTypeList } from "@/api/public";
@@ -220,7 +224,7 @@ export default {
         return {
             productAttributeList: [],
             deliveryTypeList: [
-            
+
             ],
             trackingNumber: '',
             comment: '',
@@ -275,7 +279,7 @@ export default {
                     });
                     return false;
                 }
-                    
+
             };
             if(val.flag == 0 && val.deliveryType==2){
                 if(!val.trackingNumber){
@@ -284,7 +288,7 @@ export default {
                     });
                     return false;
                 }
-                    
+
             };
             if(val.flag == 1){
                 if(!val.comment){
@@ -320,7 +324,7 @@ export default {
                 })
                 .catch(() => { });
             }
-            
+
         },
         getDetail(id) {
             detail({ orderId: id }).then(response => {
@@ -387,4 +391,3 @@ export default {
     padding-top: 0px;
 }
 </style>
-  

src/views/exchangeManage/exchangeList.vue

@@ -22,6 +22,11 @@
                         <el-option :key="item.dictValue" v-for="item in deliveryTypeList" :label="item.dictLabel" :value="item.dictValue">
                         </el-option>
             </el-select>
+            <el-input clearable class="filter-item" style="width: 200px;" placeholder="联系人"
+                           v-model="listQuery.contact"></el-input>
+            <el-input clearable class="filter-item" style="width: 200px;" placeholder="联系电话"
+                           v-model="listQuery.contactPhone"></el-input>
+
             <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>
 
@@ -84,10 +89,10 @@
         <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogVisible" :close-on-click-modal="false" width="70%">
 
             <h3>订单信息</h3>
-            
+
             <el-form status-icon label-position="center" label-width="100px" style="width:100%;">
                 <div style="display: flex;">
-                    
+
                     <el-form-item label="订单编号">
                         <el-input disabled v-model="detailData.orderSeq"></el-input>
                     </el-form-item>
@@ -193,7 +198,7 @@
 
     </div>
 </template>
-  
+
 <style>
 .demo-table-expand {
     font-size: 0;
@@ -209,7 +214,7 @@
     margin-bottom: 0;
 }
 </style>
-  
+
 <script>
 import { complete, list, detail } from "@/api/exchangeManage";
 import { dataTypeList } from "@/api/public";
@@ -299,7 +304,7 @@ export default {
                     });
                     return false;
                 }
-                    
+
             };
             if(val.flag == 0 && val.deliveryType==2){
                 if(!val.trackingNumber){
@@ -308,7 +313,7 @@ export default {
                     });
                     return false;
                 }
-                    
+
             };
             if(val.flag == 1){
                 if(!val.comment){
@@ -344,7 +349,7 @@ export default {
                 })
                 .catch(() => { });
             }
-            
+
         },
         getDetail(id) {
             detail({ orderId: id }).then(response => {
@@ -411,4 +416,3 @@ export default {
     padding-top: 0px;
 }
 </style>
-  

src/views/exchangeManage/pasList.vue

@@ -18,6 +18,10 @@
                         <el-option :key="item.dictValue" v-for="item in deliveryTypeList" :label="item.dictLabel" :value="item.dictValue">
                         </el-option>
             </el-select>
+             <el-input clearable class="filter-item" style="width: 200px;" placeholder="联系人"
+                                       v-model="listQuery.contact"></el-input>
+                        <el-input clearable class="filter-item" style="width: 200px;" placeholder="联系电话"
+                                       v-model="listQuery.contactPhone"></el-input>
             <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>
 
@@ -81,10 +85,10 @@
         <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogVisible" :close-on-click-modal="false" width="70%">
 
             <h3>订单信息</h3>
-            
+
             <el-form status-icon label-position="center" label-width="100px" style="width:100%;">
                 <div style="display: flex;">
-                    
+
                     <el-form-item label="订单编号">
                         <el-input disabled v-model="detailData.orderSeq"></el-input>
                     </el-form-item>
@@ -159,12 +163,12 @@
                         <el-input disabled v-model="detailData.deliveryTypeName"></el-input>
                     </el-form-item>
                 </div>
-                
-                    
-            
-                
-                    
-                    
+
+
+
+
+
+
                 <div style="display: flex;" v-if="detailData.deliveryType == 4">
                         <el-form-item label="充值账号">
                             <el-input disabled v-model="detailData.contactPhone"></el-input>
@@ -210,7 +214,7 @@
 
     </div>
 </template>
-  
+
 <style>
 .demo-table-expand {
     font-size: 0;
@@ -226,7 +230,7 @@
     margin-bottom: 0;
 }
 </style>
-  
+
 <script>
 import { complete, list, detail } from "@/api/exchangeManage";
 import { dataTypeList } from "@/api/public";
@@ -241,7 +245,7 @@ export default {
         return {
             productAttributeList: [],
             deliveryTypeList: [
-           
+
             ],
             trackingNumber: '',
             comment: '',
@@ -296,7 +300,7 @@ export default {
                     });
                     return false;
                 }
-                    
+
             };
             if(val.flag == 0 && val.deliveryType==2){
                 if(!val.trackingNumber){
@@ -305,7 +309,7 @@ export default {
                     });
                     return false;
                 }
-                    
+
             };
             if(val.flag == 1){
                 if(!val.comment){
@@ -341,7 +345,7 @@ export default {
                 })
                 .catch(() => { });
             }
-            
+
         },
         getDetail(id) {
             detail({ orderId: id }).then(response => {
@@ -408,4 +412,3 @@ export default {
     padding-top: 0px;
 }
 </style>
-  

src/views/exchangeManage/voidList.vue

@@ -18,6 +18,10 @@
                         <el-option :key="item.dictValue" v-for="item in deliveryTypeList" :label="item.dictLabel" :value="item.dictValue">
                         </el-option>
             </el-select>
+             <el-input clearable class="filter-item" style="width: 200px;" placeholder="联系人"
+                                       v-model="listQuery.contact"></el-input>
+                        <el-input clearable class="filter-item" style="width: 200px;" placeholder="联系电话"
+                                       v-model="listQuery.contactPhone"></el-input>
             <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>
 
@@ -81,10 +85,10 @@
         <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogVisible" :close-on-click-modal="false" width="70%">
 
             <h3>订单信息</h3>
-            
+
             <el-form status-icon label-position="center" label-width="100px" style="width:100%;">
                 <div style="display: flex;">
-                    
+
                     <el-form-item label="订单编号">
                         <el-input disabled v-model="detailData.orderSeq"></el-input>
                     </el-form-item>
@@ -204,7 +208,7 @@
 
     </div>
 </template>
-  
+
 <style>
 .demo-table-expand {
     font-size: 0;
@@ -220,7 +224,7 @@
     margin-bottom: 0;
 }
 </style>
-  
+
 <script>
 import { complete, list, detail } from "@/api/exchangeManage";
 import { dataTypeList } from "@/api/public";
@@ -235,7 +239,7 @@ export default {
         return {
             productAttributeList: [],
             deliveryTypeList: [
-            
+
             ],
             trackingNumber: '',
             comment: '',
@@ -290,7 +294,7 @@ export default {
                     });
                     return false;
                 }
-                    
+
             };
             if(val.flag == 0 && val.deliveryType==2){
                 if(!val.trackingNumber){
@@ -299,7 +303,7 @@ export default {
                     });
                     return false;
                 }
-                    
+
             };
             if(val.flag == 1){
                 if(!val.comment){
@@ -335,7 +339,7 @@ export default {
                 })
                 .catch(() => { });
             }
-            
+
         },
         getDetail(id) {
             detail({ orderId: id }).then(response => {
@@ -402,4 +406,3 @@ export default {
     padding-top: 0px;
 }
 </style>
-  

src/views/yeZhanManage/likeList.vue

@@ -42,6 +42,8 @@
       </el-table-column>
       <el-table-column align="center" min-width="80px" label="状态" prop="statusName">
       </el-table-column>
+      <el-table-column align="center" min-width="80px" label="事项" prop="mattersName">
+      </el-table-column>
       <el-table-column align="center" min-width="200px" label="附件">
         <template slot-scope="props">
           <div v-for="(item, index) in props.row.files" :key="index">
@@ -49,6 +51,8 @@
           </div>
         </template>
       </el-table-column>
+      <el-table-column align="center" min-width="80px" label="奖励分数" prop="integral">
+            </el-table-column>
       <el-table-column align="center" label="操作" width="150px" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button :disabled="scope.row.status == 0 ? false : true" type="primary" size="small"
@@ -202,4 +206,5 @@ export default {
 
   },
 };
-</script>
+</script>
+