zhangdan 4 years ago
parent
commit
001cfa3807

+ 65 - 0
src/libs/getDate.js

@@ -0,0 +1,65 @@
+// 引入 moment 时间插件
+import moment from "moment";
+//获取今日/昨日/本周/上周/本月/上月 时间
+export default {
+    // 获取今日的开始结束时间
+    getToday() {
+        let obj = {
+            starttime: '',
+            endtime: ''
+        }
+        obj.starttime = moment(moment().startOf("day").valueOf()).format("YYYY-MM-DD");
+        obj.endtime = moment(moment().valueOf()).format("YYYY-MM-DD");
+        return obj
+    },
+    // 获取昨日的开始结束时间
+    getYesterday() {
+        let obj = {
+            starttime: '',
+            endtime: ''
+        }
+        obj.starttime = moment(moment().add(-1, 'days').startOf("day").valueOf()).format("YYYY-MM-DD");
+        obj.endtime = moment(moment().add(-1, 'days').endOf('day').valueOf()).format('YYYY-MM-DD');
+        return obj
+    },
+    // 获取当前周的开始结束时间
+    getCurrWeekDays() {
+        let obj = {
+            starttime: '',
+            endtime: ''
+        }
+        obj.starttime = moment(moment().week(moment().week()).startOf('week').add(1, 'days').valueOf()).format('YYYY-MM-DD')
+        obj.endtime = moment(moment().week(moment().week()).endOf('week').add(1, 'days').valueOf()).format('YYYY-MM-DD');
+        return obj
+    },
+    // 获取上一周的开始结束时间
+    getLastWeekDays() {
+        let obj = {
+            starttime: '',
+            endtime: ''
+        }
+        obj.starttime = moment(moment().week(moment().week() - 1).startOf('week').add(1, 'days').valueOf()).format('YYYY-MM-DD')
+        obj.endtime = moment(moment().week(moment().week() - 1).endOf('week').add(1, 'days').valueOf()).format('YYYY-MM-DD');
+        return obj
+    },
+    // 获取当前月的开始结束时间
+    getCurrMonthDays() {
+        let obj = {
+            starttime: '',
+            endtime: ''
+        }
+        obj.starttime = moment(moment().month(moment().month()).startOf('month').valueOf()).format('YYYY-MM-DD');
+        obj.endtime = moment(moment().month(moment().month()).endOf('month').valueOf()).format('YYYY-MM-DD');
+        return obj
+    },
+    // 获取上一个月的开始结束时间
+    getLastMonthDays() {
+        let obj = {
+            starttime: '',
+            endtime: ''
+        }
+        obj.starttime = moment(moment().month(moment().month() - 1).startOf('month').valueOf()).format('YYYY-MM-DD');
+        obj.endtime = moment(moment().month(moment().month() - 1).endOf('month').valueOf()).format('YYYY-MM-DD');
+        return obj
+    }
+}

+ 10 - 9
src/views/CouponStatistics/CouponStatistics.vue

@@ -2,22 +2,22 @@
   <a-card :bordered="false">
     <!-- 搜索条件 -->
     <div class="CouponStatistics-searchForm">
-      <a-form layout="inline" ref="searchForm">
+      <a-form ref="searchForm">
         <a-row :gutter="48">
           <a-col :span="6">
-            <a-form-item label="发券网点">
-              <a-input v-model.trim="searchForm.num" placeholder="请输入" allowClear style="width: 200px;" />
+            <a-form-item label="发券网点" :label-col="{ span:6 }" :wrapper-col="{ span:12}">
+              <a-input v-model.trim="searchForm.area" placeholder="请输入" allowClear/>
             </a-form-item>
           </a-col>
           <a-col :span="6">
-            <a-form-item label="优惠券名称">
-              <a-input v-model.trim="searchForm.num" placeholder="请输入" allowClear style="width: 200px;" />
+            <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="优惠券类型">
-              <v-select v-model="searchForm.name" placeholder="请选择" allowClear style="width: 200px;"></v-select>
+            <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">
@@ -56,8 +56,9 @@
     data() {
       return {
         searchForm: {
-          name: '',
-          num: ''
+          name: '',      // 优惠券名称
+          area: '',      // 网点名称
+          couponType:''  // 优惠券类型
         },
         columns: [{
             title: '序号',

+ 37 - 39
src/views/Order/OrderCenter.vue

@@ -2,44 +2,44 @@
   <a-card :bordered="false">
     <!-- 搜索条件 -->
     <div class="orderCenter-searchForm">
-      <a-form layout="inline" ref="searchForm">
+      <a-form ref="searchForm">
         <a-row :gutter="48">
           <a-col :span="8">
-            <a-form-item label="创建时间">
-              <a-range-picker v-model="time" :placeholder="['开始时间','结束时间']" @change="onChange" />
+            <a-form-item label="创建时间" :label-col="{ span:4 }" :wrapper-col="{ span:12}">
+              <a-range-picker v-model="time" :format="dateFormat" :placeholder="['开始时间','结束时间']" @change="onChange" />
             </a-form-item>
           </a-col>
           <a-col :span="6">
-            <a-form-item label="网点名称">
-              <v-select v-model="searchForm.name" placeholder="请选择" allowClear style="width: 200px;"></v-select>
+            <a-form-item label="网点名称" :label-col="{ span:6 }" :wrapper-col="{ span:12}">
+              <v-select v-model="searchForm.name" mode="multiple" placeholder="请选择" allowClear></v-select>
             </a-form-item>
           </a-col>
           <a-col :span="6">
-            <a-form-item label="单号">
-              <a-input v-model.trim="searchForm.num" placeholder="请输入" allowClear style="width: 200px;" />
+            <a-form-item label="单号" :label-col="{ span:6 }" :wrapper-col="{ span:12}">
+              <a-input v-model.trim="searchForm.num" placeholder="请输入" allowClear/>
             </a-form-item>
           </a-col>
+          <a-col :span="4">
+            <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-row :gutter="48">
           <a-col :span="8">
-            <a-form-item label="服务项目">
-              <v-select v-model="searchForm.name" placeholder="请选择" allowClear style="width: 200px;" @change="onChange"></v-select>
+            <a-form-item label="服务项目" :label-col="{ span:4 }" :wrapper-col="{ span:12}">
+              <v-select v-model="searchForm.fwname" placeholder="请选择" allowClear  @change="onChange"></v-select>
             </a-form-item>
           </a-col>
           <a-col :span="6">
-            <a-form-item label="手机号码">
-              <a-input v-model.trim="searchForm.num" placeholder="请输入" allowClear maxLength="11" style="width: 200px;" />
+            <a-form-item label="手机号码" :label-col="{ span:6 }" :wrapper-col="{ span:12}">
+              <a-input v-model.trim="searchForm.phone" placeholder="请输入" allowClear maxLength="11" />
             </a-form-item>
           </a-col>
           <a-col :span="6">
-            <a-form-item label="状态">
-              <v-select v-model="searchForm.name" placeholder="请选择" allowClear style="width: 200px;"></v-select>
+            <a-form-item label="状态" :label-col="{ span:6 }" :wrapper-col="{ span:12}">
+              <v-select v-model="searchForm.status" placeholder="请选择" allowClear></v-select>
             </a-form-item>
           </a-col>
-          <a-col :span="4">
-            <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>
@@ -63,10 +63,9 @@
 </template>
 
 <script>
-  import {
-    STable,
-    VSelect
-  } from '@/components'
+  import { STable, VSelect } from '@/components'
+  import getDate from '../../libs/getDate.js'
+  import moment from 'moment'
   export default {
     components: {
       STable,
@@ -76,12 +75,19 @@
       return {
         // 查询参数
         searchForm: {
-          beginDate: null,
-          endDate: null,
-          name: '',
-          num: ''
+          beginDate: null,  // 创建的开始时间
+          endDate: null,    // 创建的结束时间
+          name: '',         // 网点名称
+          num: '',          // 单号
+          fwname:'',        // 服务项目
+          phone:'',         // 手机号码
+          status:''         // 状态
         },
-        time: null,
+        time: [
+          moment(getDate.getToday().starttime, this.dateFormat),
+					moment(getDate.getToday().endtime, this.dateFormat)
+        ],
+        dateFormat: 'YYYY-MM-DD',
         columns: [{
             title: '创建时间',
             dataIndex: 'createTime',
@@ -93,35 +99,30 @@
             dataIndex: 'createTime',
             minWidth: '40',
             align: 'center'
-
           },
           {
             title: '网点名称',
             dataIndex: 'createTime',
             minWidth: '40',
             align: 'center'
-
           },
           {
             title: '服务项目',
             dataIndex: 'createTime',
             minWidth: '40',
             align: 'center'
-
           },
           {
             title: '手机号码',
             dataIndex: 'createTime',
             minWidth: '40',
             align: 'center'
-
           },
           {
             title: '应收(¥)',
             dataIndex: 'createTime',
             minWidth: '40',
             align: 'center'
-
           },
           {
             title: '实收(¥)',
@@ -158,6 +159,8 @@
         ],
         // 加载数据方法 必须为 Promise 对象
         loadData: parameter => {
+          // this.searchData.beginDate == null ? this.searchData.beginDate = getDate.getToday().starttime : null
+          // this.searchData.endDate == null ? this.searchData.endDate = getDate.getToday().endtime : null
           // return getTenantsList(Object.assign(parameter, this.searchForm)).then(res => {
           //   if (res.status == 200) {
           //     const no = (res.data.pageNo - 1) * res.data.pageSize
@@ -173,6 +176,7 @@
       }
     },
     methods: {
+      moment,
       // 创建时间change
       onChange(dates, dateStrings) {
         if ((dates, dateStrings)) {
@@ -183,11 +187,7 @@
       },
       // 查看详情--跳转到对应的详情页
       seeDetail(row) {
-        this.$router.push({
-          name: 'OrderDetail',
-          query: {
-            id: row.id
-          }
+        this.$router.push({name: 'OrderDetail',query: {id: row.id}
         })
       },
       // 退款
@@ -216,11 +216,9 @@
         this.$refs.table.refresh()
       }
     }
-
   }
 </script>
-
-<style>
+<style lang="less">
   .orderCenter-searchForm,
   .addButton {
     margin-bottom: 0;

+ 88 - 86
src/views/Order/OrderDetail.vue

@@ -1,124 +1,126 @@
 <template>
   <a-card :bordered="false">
     <div class="orderDetail-content">
-      <a-form layout="inline">
+      <a-form>
         <a-row :gutter="24">
           <a-col :span="8">
-            <a-form-item label="创建时间">
+            <a-form-item label="创建时间" :label-col="{ span:6 }" :wrapper-col="{ span:12}">
               <span>{{"123456789"}}</span>
             </a-form-item>
           </a-col>
           <a-col :span="8">
-            <a-form-item label="单号">
+            <a-form-item label="单号" :label-col="{ span:6 }" :wrapper-col="{ span:12}">
               <span>{{"123456789"}}</span>
             </a-form-item>
           </a-col>
           <a-col :span="8">
-            <a-form-item label="门店名称">
+            <a-form-item label="门店名称" :label-col="{ span:6 }" :wrapper-col="{ span:12}">
               <span>{{"123456789"}}</span>
             </a-form-item>
           </a-col>
         </a-row>
-       <a-row :gutter="24">
-         <a-col :span="8">
-           <a-form-item label="服务名称">
-             <span>{{"123456789"}}</span>
-           </a-form-item>
-         </a-col>
-         <a-col :span="8">
-           <a-form-item label="手机号码">
-             <span>{{"123456789"}}</span>
-           </a-form-item>
-         </a-col>
-         <a-col :span="8">
-           <a-form-item label="状态">
-             <span>{{"123456789"}}</span>
-           </a-form-item>
-         </a-col>
-       </a-row>
-       <a-row :gutter="24">
-         <a-col :span="8">
-           <a-form-item label="应付(¥)">
-             <span>{{"123456789"}}</span>
-           </a-form-item>
-         </a-col>
-         <a-col :span="8">
-           <a-form-item label="优惠(¥)">
-             <span>{{"123456789"}}</span>
-           </a-form-item>
-         </a-col>
-         <a-col :span="8">
-           <a-form-item label="优惠券名称:">
-             <span>{{"123456789"}}</span>
-           </a-form-item>
-         </a-col>
-       </a-row>  
-       <a-row :gutter="24">
-         <a-col :span="8">
-           <a-form-item label="实付(¥)">
-             <span>{{"123456789"}}</span>
-           </a-form-item>
-         </a-col>
-         <a-col :span="8">
-           <a-form-item label="洗车照片">
-             <div style="display: flex;">
-               <!-- 洗车前照片 -->
-                <div style="margin-right: 20px;">
-                  <div style="border: 1px solid #eee;overflow: hidden;padding: 8px">
-                    <img :src="advertisementImg" style="width: 100px; height: 100px;" alt=""/>
+        <a-row :gutter="24">
+          <a-col :span="8">
+            <a-form-item label="服务名称" :label-col="{ span:6 }" :wrapper-col="{ span:12}">
+              <span>{{"123456789"}}</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="8">
+            <a-form-item label="手机号码" :label-col="{ span:6 }" :wrapper-col="{ span:12}">
+              <span>{{"123456789"}}</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="8">
+            <a-form-item label="状态" :label-col="{ span:6 }" :wrapper-col="{ span:12}">
+              <span>{{"123456789"}}</span>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row :gutter="24">
+          <a-col :span="8">
+            <a-form-item label="应付(¥)" :label-col="{ span:6 }" :wrapper-col="{ span:12}">
+              <span>{{"123456789"}}</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="8">
+            <a-form-item label="优惠(¥)" :label-col="{ span:6 }" :wrapper-col="{ span:12}">
+              <span>{{"123456789"}}</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="8">
+            <a-form-item label="优惠券名称" :label-col="{ span:6 }" :wrapper-col="{ span:12}">
+              <span>{{"123456789"}}</span>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row :gutter="24">
+          <a-col :span="8">
+            <a-form-item label="实付(¥)" :label-col="{ span:6 }" :wrapper-col="{ span:12}">
+              <span>{{"123456789"}}</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="8">
+            <a-form-item label="洗车照片" :label-col="{ span:6 }" :wrapper-col="{ span:12}">
+              <div style="display: flex;">
+                <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>
                   </div>
-                  <div style="text-align: center;">洗车前</div> 
+                  <div style="text-align: center;">洗车前</div>
                 </div>
-                <!-- 洗车后照片 -->
                 <div>
-                  <div id="img" style="border: 1px solid #eee;overflow: hidden;padding: 8px">
-                    <img class="img1" src="../../assets/avatar2.jpg" alt=""/>
+                  <div style="border: 1px solid #eee;overflow: hidden;padding: 8px 0 0 8px;">
+                    <Upload v-decorator="img" :fileSize="0.25" listType="picture-card">
+                    </Upload>
                   </div>
-                  <div style="text-align: center;">洗车后</div> 
+                  <div style="text-align: center;">洗车后</div>
                 </div>
-             </div>
-              
-           </a-form-item>
-         </a-col>
-       </a-row>
-         <a-row style="text-align: center;margin-top: 100px;">
-           <a-col>
-             <a-form-item>
-               <a-button type="default" @click="goBack()">返回列表</a-button>
-             </a-form-item>
-           </a-col>
-         </a-row>
+              </div>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row style="text-align: center;margin-top: 100px;">
+          <a-col>
+            <a-form-item>
+              <a-button type="default" @click="goBack()">返回列表</a-button>
+            </a-form-item>
+          </a-col>
+        </a-row>
       </a-form>
     </div>
   </a-card>
 </template>
 
 <script>
-  export default{
-    data(){
-      return{
-       
+  import {
+    Upload
+  } from '@/components'
+  export default {
+    components: {
+      Upload
+    },
+    data() {
+      return {
+        img: '', // 洗车前后图片
       }
     },
-    methods:{
-      goBack(){
-        this.$router.push({ name: 'OrderCenter' })
+    methods: {
+      // 返回列表
+      goBack() {
+        this.$router.push({
+          name: 'OrderCenter'
+        })
       },
     }
   }
 </script>
-<style>
-  .orderDetail-content .ant-form-inline .ant-form-item{
+<style lang="less">
+  .orderDetail-content .ant-form-inline .ant-form-item {
     margin-bottom: 20px;
   }
-  #img .img1{
-    width: 150px;
-    height: auto;
-    transition:all 2s;/*图片放大过程的时间*/
-    position: relative;
-  }
-  .img1:hover{
-    cursor: crosshair;
-    transform: scale(1.9);  /*以y轴为中心旋转*/
+  /* 去掉上传图片组件原有的删除按钮 */
+  :global(.anticon-delete) {
+    display: none;
   }
 </style>

+ 28 - 21
src/views/RefundRecord/RefundRecord.vue

@@ -2,21 +2,21 @@
   <a-card :bordered="false">
     <!-- 搜索条件 -->
     <div class="orderCenter-searchForm">
-      <a-form layout="inline" ref="searchForm">
+      <a-form ref="searchForm">
         <a-row :gutter="48">
           <a-col :span="8">
-            <a-form-item label="创建时间">
-              <a-range-picker v-model="time" :placeholder="['开始时间','结束时间']" @change="onChange" />
+            <a-form-item label="创建时间" :label-col="{ span:4 }" :wrapper-col="{ span:12}">
+              <a-range-picker v-model="time" :format="dateFormat" :placeholder="['开始时间','结束时间']" @change="onChange" />
             </a-form-item>
           </a-col>
           <a-col :span="6">
-            <a-form-item label="关联订单号">
-              <a-input v-model.trim="searchForm.num" placeholder="请输入" allowClear style="width: 200px;" />
+            <a-form-item label="关联订单号" :label-col="{ span:6 }" :wrapper-col="{ span:12}">
+              <a-input v-model.trim="searchForm.num" placeholder="请输入" allowClear  />
             </a-form-item>
           </a-col>
           <a-col :span="6">
-            <a-form-item label="网点名称">
-              <v-select v-model="searchForm.name" placeholder="请选择" allowClear style="width: 200px;"></v-select>
+            <a-form-item label="网点名称" :label-col="{ span:6 }" :wrapper-col="{ span:12}">
+              <v-select v-model="searchForm.name" placeholder="请选择" allowClear ></v-select>
             </a-form-item>
           </a-col>
           <a-col :span="4">
@@ -26,13 +26,13 @@
         </a-row>
         <a-row :gutter="48">
           <a-col :span="8">
-            <a-form-item label="服务项目">
-              <v-select v-model="searchForm.name" placeholder="请选择" allowClear style="width: 200px;"></v-select>
+            <a-form-item label="服务项目" :label-col="{ span:4 }" :wrapper-col="{ span:12}">
+              <v-select v-model="searchForm.fwname" placeholder="请选择" allowClear></v-select>
             </a-form-item>
           </a-col>
           <a-col :span="6">
-            <a-form-item label="退款状态">
-              <v-select v-model="searchForm.name" placeholder="请选择" allowClear style="width: 200px;"></v-select>
+            <a-form-item label="退款状态" :label-col="{ span:6 }" :wrapper-col="{ span:12}">
+              <v-select v-model="searchForm.status" placeholder="请选择" allowClear ></v-select>
             </a-form-item>
           </a-col>
         </a-row>
@@ -53,10 +53,9 @@
 </template>
 
 <script>
-  import {
-    STable,
-    VSelect
-  } from '@/components'
+  import { STable, VSelect } from '@/components'
+  import getDate from '../../libs/getDate.js'
+  import moment from 'moment'
   export default {
     components: {
       STable,
@@ -66,12 +65,18 @@
       return {
         // 查询参数
         searchForm: {
-          beginDate: null,
-          endDate: null,
-          name: '',
-          num: ''
+          beginDate: null,  // 创建的开始时间
+          endDate: null,    // 创建的结束时间
+          name: '',         // 网点名称
+          num: '',          // 单号
+          fwname:'',        // 服务项目
+          status:''         // 状态
         },
-        time: null,
+        time: [
+          moment(getDate.getToday().starttime, this.dateFormat),
+          moment(getDate.getToday().endtime, this.dateFormat)
+        ],
+        dateFormat: 'YYYY-MM-DD',
         columns: [{
             title: '创建时间',
             dataIndex: 'createTime',
@@ -139,6 +144,8 @@
         ],
         // 加载数据方法 必须为 Promise 对象
         loadData: parameter => {
+          // this.searchData.beginDate == null ? this.searchData.beginDate = getDate.getToday().starttime : null
+          // this.searchData.endDate == null ? this.searchData.endDate = getDate.getToday().endtime : null
           // return getTenantsList(Object.assign(parameter, this.searchForm)).then(res => {
           //   if (res.status == 200) {
           //     const no = (res.data.pageNo - 1) * res.data.pageSize
@@ -171,7 +178,7 @@
   }
 </script>
 
-<style>
+<style lang="less">
   .orderCenter-searchForm,
   .addButton {
     margin-bottom: 0;