zhangdan 4 anos atrás
pai
commit
d26c3f306c

+ 13 - 3
src/config/router.config.js

@@ -149,14 +149,24 @@ export const asyncRouterMap = [
         // permission: 'M_setting_0'
       },
       children: [{
-        path: '/CouponStatistics/CouponStatistics',
-        name: 'CouponStatistics',
-        component: () => import('@/views/CouponStatistics/CouponStatistics.vue'),
+        path: '/CouponStatistics/CouponStatisticsList',
+        name: 'CouponStatisticsList',
+        component: () => import('@/views/CouponStatistics/CouponStatisticsList.vue'),
         meta: {
           title: '优惠券统计',
           icon: 'setting'
           // permission: 'M_sys_dataDictionary'
         }
+      },
+      {
+        path: '/CouponStatistics/CouponStatisticsDetail',
+        name: 'CouponStatisticsDetail',
+        component: () => import('@/views/CouponStatistics/CouponStatisticsDetail.vue'),
+        meta: {
+          title: '优惠券领取详情',
+          icon: 'setting'
+          // permission: 'M_sys_dataDictionary'
+        }
       }
       ]
     },

+ 147 - 0
src/views/CouponStatistics/CouponStatisticsDetail.vue

@@ -0,0 +1,147 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 搜索条件 -->
+    <h3 class="coupon-detail-title" v-model="title">{{title}},领取详情</h3>
+    <a-divider />
+    <div class="CouponStatisticsDetail-searchForm">
+      <a-form ref="searchForm" labelAlign="left">
+        <a-row :gutter="48">
+          <a-col :span="6">
+            <a-form-item label="领券时间" :label-col="{ span:6 }" :wrapper-col="{ span:14 }">
+              <a-range-picker v-model="time" :format="dateFormat" :placeholder="['开始时间','结束时间']" @change="onChange" />
+            </a-form-item>
+          </a-col>
+          <a-col :span="6">
+            <a-form-item label="手机号码" :label-col="{ span:6 }" :wrapper-col="{ span:12}">
+              <a-input v-model.trim="searchForm.name" placeholder="请输入" allowClear/>
+          
+            </a-form-item>
+          </a-col>
+          <a-col :span="6">
+            <a-form-item label="领券网点" :label-col="{ span:6 }" :wrapper-col="{ span:12}">
+              <a-input v-model.trim="searchForm.name" placeholder="请输入" allowClear/>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row :gutter="48">
+          <a-col :span="6">
+            <a-form-item label="用券时间" :label-col="{ span:6 }" :wrapper-col="{ span:14 }">
+              <a-range-picker v-model="time" :format="dateFormat" :placeholder="['开始时间','结束时间']" @change="onChange" />
+            </a-form-item>
+          </a-col>
+          <a-col :span="6">
+            <a-form-item label="使用状态" :label-col="{ span:6 }" :wrapper-col="{ span:12}">
+              <v-select v-model="searchForm.couponType" placeholder="请选择" allowClear></v-select>
+            </a-form-item>
+          </a-col>
+          <a-col :span="6">
+            <a-form-item label="用券网点" :label-col="{ span:6 }" :wrapper-col="{ span:12}">
+              <a-input v-model.trim="searchForm.name" placeholder="请输入" allowClear/>
+            </a-form-item>
+          </a-col>
+          <a-col :span="6">
+            <a-button style="margin-right: 10px;" type="primary" @click="$refs.table.refresh(true)">查询</a-button>
+            <a-button type="" @click="resetForm">重置</a-button>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 列表 -->
+    <s-table ref="table" size="default" :rowKey="(record) => record.id" :columns="columns" :data="loadData" bordered>
+      <!-- 状态 -->
+      <span slot="status" slot-scope="text, record">
+        <template></template>
+      </span>
+    </s-table>
+  </a-card>
+</template>
+
+<script>
+  import {
+    STable,
+    VSelect
+  } from '@/components'
+  export default{
+    components:{ STable,VSelect },
+    data(){
+      return{
+        searchForm:{
+          name:'',
+        },
+        title:"3元代金券",
+        columns: [{
+            title: '序号',
+            dataIndex: 'no',
+            minWidth: '40',
+            align: 'center'
+          },
+        
+          {
+            title: '领券时间',
+            dataIndex: 'no',
+            minWidth: '40',
+            align: 'center'
+          },
+          {
+            title: '领券手机号码',
+            dataIndex: 'no',
+            minWidth: '40',
+            align: 'center'
+          },
+          {
+            title: '使用状态',
+            dataIndex: 'no',
+            minWidth: '40',
+            align: 'center'
+          },
+          {
+            title: '用券网点',
+            dataIndex: 'no',
+            minWidth: '40',
+            align: 'center'
+          },
+          {
+            title: '用券时间',
+            dataIndex: 'no',
+            minWidth: '40',
+            align: 'center'
+          },
+          {
+            title: '关联消费金额',
+            dataIndex: 'no',
+            minWidth: '40',
+            align: 'center'
+          }
+        ],
+        // 加载数据方法 必须为 Promise 对象
+        loadData: parameter => {
+          // return getTenantsList(Object.assign(parameter, this.searchForm)).then(res => {
+          //   if (res.status == 200) {
+          //     const no = (res.data.pageNo - 1) * res.data.pageSize
+          //     for (let i = 0; i < res.data.list.length; i++) {
+          //       const _item = res.data.list[i]
+          //       _item.no = no + i + 1
+          //       _item.status = _item.status + '' === '1'
+          //     }
+          //     return res.data
+          //   }
+          // })
+        }
+      }
+    },
+    methods:{
+      // 重置
+      resetForm(){
+        this.$refs.searchForm.resetFields()
+        this.$refs.table.refresh(true)
+      }
+    }
+  }
+</script>
+
+<style lang="less">
+  .coupon-detail-title{
+    margin-bottom: 20px;
+    margin-left: 20px;
+  }
+</style>

+ 0 - 0
src/views/CouponStatistics/CouponStatistics.vue → src/views/CouponStatistics/CouponStatisticsList.vue


+ 2 - 2
src/views/Order/OrderCenter.vue

@@ -11,7 +11,7 @@
           </a-col>
           <a-col :span="6">
             <a-form-item label="网点名称" :label-col="{ span:6 }" :wrapper-col="{ span:12}">
-              <v-select v-model="searchForm.name" mode="multiple" placeholder="请选择" allowClear></v-select>
+              <v-select v-model="searchForm.name" code="ACTIVE_RELEASE_STATUS" mode="multiple" placeholder="请选择" allowClear></v-select>
             </a-form-item>
           </a-col>
           <a-col :span="6">
@@ -27,7 +27,7 @@
         <a-row :gutter="48">
           <a-col :span="8">
             <a-form-item label="服务项目" :label-col="{ span:4 }" :wrapper-col="{ span:12}">
-              <v-select v-model="searchForm.fwname" placeholder="请选择" allowClear  @change="onChange"></v-select>
+              <v-select v-model="searchForm.fwname" placeholder="请选择" allowClear></v-select>
             </a-form-item>
           </a-col>
           <a-col :span="6">

+ 7 - 11
src/views/Order/OrderDetail.vue

@@ -62,20 +62,20 @@
           <a-col :span="8">
             <a-form-item label="洗车照片" :label-col="{ span:6 }" :wrapper-col="{ span:12}">
               <div style="display: flex;">
-                <div>
+                <!-- <div>
                   <div style="border: 1px solid #eee;overflow: hidden;padding: 8px 0 0 8px; margin-right: 20px;">
-                    <Upload v-decorator="img" :fileSize="0.25" listType="picture-card">
+                    <Upload :file-list="" :fileSize="0.25" listType="picture-card">
                     </Upload>
                   </div>
                   <div style="text-align: center;">洗车前</div>
                 </div>
                 <div>
                   <div style="border: 1px solid #eee;overflow: hidden;padding: 8px 0 0 8px;">
-                    <Upload v-decorator="img" :fileSize="0.25" listType="picture-card">
+                    <Upload :file-list="" :fileSize="0.25" listType="picture-card">
                     </Upload>
                   </div>
                   <div style="text-align: center;">洗车后</div>
-                </div>
+                </div> -->
               </div>
             </a-form-item>
           </a-col>
@@ -93,16 +93,12 @@
 </template>
 
 <script>
-  import {
-    Upload
-  } from '@/components'
+  import { Upload } from '@/components'
   export default {
-    components: {
-      Upload
-    },
+    components: { Upload },
     data() {
       return {
-        img: '', // 洗车前后图片
+        
       }
     },
     methods: {