Browse Source

20190718订单

suochencheng 6 years ago
parent
commit
91748dbe51

+ 2 - 2
src/main/java/com/izouma/awesomeadmin/constant/AppConstant.java

@@ -180,14 +180,14 @@ public interface AppConstant {
         int ACCESS_OVER = 9;
 
         /**
-         * 退款成功
+         * 成功
          */
         int FINISH = 10;
 
         /**
          * 取消
          */
-        int CANCEL = 10;
+        int CANCEL = 11;
 
 
     }

File diff suppressed because it is too large
+ 91 - 74
src/main/vue/src/pages/UserOrderDetail.vue


+ 1016 - 833
src/main/vue/src/pages/UserOrderDetails.vue

@@ -1,7 +1,23 @@
 <template>
     <div>
         <div class="filters-container">
-        
+
+            <el-select v-model="storeId" size="small" clearable filterable placeholder="店铺" @change="searchData" style="width:120px">
+                <el-option v-for="item in storeInfos" :key="item.id" :label="item.storeName" :value="item.id"></el-option>
+            </el-select>
+            <el-select v-model="userId" size="small" clearable filterable placeholder="用户" @change="searchData" style="width:120px">
+                <el-option v-for="item in userInfos" :key="item.id" :label="item.nickname" :value="item.id"></el-option>
+            </el-select>
+            <el-select v-model="payModeKey" size="small" clearable filterable placeholder="支付方式" @change="searchData" style="width:120px">
+                <el-option v-for="item in payModeOptions" :key="item.value" :label="item.label" :value="item.value"></el-option>
+            </el-select>
+            <el-select v-model="typeFlagKey" size="small" clearable filterable placeholder="订单类型" @change="searchData" style="width:120px">
+                <el-option v-for="item in typeFlagOptions" :key="item.value" :label="item.label" :value="item.value"></el-option>
+            </el-select>
+            <el-select v-model="orderStatusKey" size="small" clearable filterable placeholder="订单状态" @change="searchData" style="width:120px">
+                <el-option v-for="item in orderStatusOptions" :key="item.value" :label="item.label" :value="item.value"></el-option>
+            </el-select>
+
             <el-input placeholder="关键字" size="small" v-model="filter1" clearable class="filter-item"></el-input>
             <el-button @click="searchData" type="primary" size="small" icon="el-icon-search" class="filter-item">搜索
             </el-button>
@@ -19,7 +35,7 @@
             </el-button>
             <el-dropdown trigger="click" size="medium" class="table-column-filter">
                 <span>
-                  筛选数据<i class="el-icon-arrow-down el-icon--right"></i>
+                    筛选数据<i class="el-icon-arrow-down el-icon--right"></i>
                 </span>
                 <el-dropdown-menu slot="dropdown" class="table-column-filter-wrapper">
                     <el-checkbox v-for="item in tableColumns" :key="item.value" v-model="item.show">{{item.label}}
@@ -28,305 +44,316 @@
             </el-dropdown>
         </div>
         <el-table
-                :data="tableData"
-                :height="tableHeight"
-                row-key="id"
-                ref="table">
-            <el-table-column
-                    v-if="multipleMode"
-                    align="center"
-                    type="selection"
-                    width="50">
-            </el-table-column>
-            <el-table-column
-                    type="index"
-                    min-width="50"
-                    align="center">
-            </el-table-column>
-                            
-                                            <el-table-column
-                                v-if="isColumnShow('id')"
-                                prop="id"
-                                label="ID"
-                                min-width="100">
-                        </el-table-column>
-                                                                                                                                                                                                            
-                                            <el-table-column
-                                v-if="isColumnShow('userId')"
-                                prop="userId"
-                                label="用户"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('orderCode')"
-                                prop="orderCode"
-                                label="订单号"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('storeId')"
-                                prop="storeId"
-                                label="店铺"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('typeFlag')"
-                                prop="typeFlag"
-                                label="类型"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('productId')"
-                                prop="productId"
-                                label="商品"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('productName')"
-                                prop="productName"
-                                label="商品名"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('downPayment')"
-                                prop="downPayment"
-                                label="定金"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('unitPrice')"
-                                prop="unitPrice"
-                                label="单价"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('quantity')"
-                                prop="quantity"
-                                label="数量"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('offPrice')"
-                                prop="offPrice"
-                                label="减价格"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('couponPrice')"
-                                prop="couponPrice"
-                                label="优惠价格"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('totalPrice')"
-                                prop="totalPrice"
-                                label="总价格"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('dealPrice')"
-                                prop="dealPrice"
-                                label="支付价格"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('payMode')"
-                                prop="payMode"
-                                label="支付方式"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('payTime')"
-                                prop="payTime"
-                                label="支付时间"
-                                :formatter="DateTimeFormatter"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('remark')"
-                                prop="remark"
-                                label="备注"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('showFlag')"
-                                prop="showFlag"
-                                label="前端显示"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('statusFlag')"
-                                prop="statusFlag"
-                                label="状态"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('fee')"
-                                prop="fee"
-                                label="手续费"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('coin')"
-                                prop="coin"
-                                label="余额"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('point')"
-                                prop="point"
-                                label="积分"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('cash')"
-                                prop="cash"
-                                label="现金"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('userAddressId')"
-                                prop="userAddressId"
-                                label="地址Id"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('serviceId')"
-                                prop="serviceId"
-                                label="店铺服务"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('message')"
-                                prop="message"
-                                label="留言"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('useType')"
-                                prop="useType"
-                                label="消费方式"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('orderId')"
-                                prop="orderId"
-                                label="订单Id"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('tailMoney')"
-                                prop="tailMoney"
-                                label="尾款"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('bookPhotoTime')"
-                                prop="bookPhotoTime"
-                                label="预约拍照时间"
-                                :formatter="DateTimeFormatter"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('photoTime')"
-                                prop="photoTime"
-                                label="拍照时间"
-                                :formatter="DateTimeFormatter"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('bookSelectTime')"
-                                prop="bookSelectTime"
-                                label="预约选片时间"
-                                :formatter="DateTimeFormatter"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('selectTime')"
-                                prop="selectTime"
-                                label="选片时间"
-                                :formatter="DateTimeFormatter"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('bookCheckTime')"
-                                prop="bookCheckTime"
-                                label="预约审片时间"
-                                :formatter="DateTimeFormatter"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('checkTime')"
-                                prop="checkTime"
-                                label="审片时间"
-                                :formatter="DateTimeFormatter"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('bookAccessTime')"
-                                prop="bookAccessTime"
-                                label="预约取件时间"
-                                :formatter="DateTimeFormatter"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('accessTime')"
-                                prop="accessTime"
-                                label="取件时间"
-                                :formatter="DateTimeFormatter"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('commentTime')"
-                                prop="commentTime"
-                                label="评论时间"
-                                :formatter="DateTimeFormatter"
-                                min-width="100">
-                        </el-table-column>
-                                                            <el-table-column
-                    label="操作"
-                    align="center"
-                    fixed="right"
-                    min-width="150"
-            >
+                  :data="tableData"
+                  :height="tableHeight"
+                  row-key="id"
+                  ref="table">
+            <el-table-column
+                             v-if="multipleMode"
+                             align="center"
+                             type="selection"
+                             width="50">
+            </el-table-column>
+            <el-table-column
+                             v-if="isColumnShow('id')"
+                             prop="id"
+                             label="ID"
+                             min-width="50">
+            </el-table-column>
+
+            <el-table-column
+                             v-if="isColumnShow('statusFlag')"
+                             prop="statusFlag"
+                             :formatter="StatusFlagFormatter"
+                             label="状态"
+                             min-width="70">
+            </el-table-column>
+
+            <el-table-column
+                             v-if="isColumnShow('userId')"
+                             prop="userId"
+                             label="用户"
+                             min-width="70">
+            </el-table-column>
+
+            <el-table-column
+                             v-if="isColumnShow('orderCode')"
+                             prop="orderCode"
+                             label="订单号"
+                             min-width="150">
+            </el-table-column>
+
+            <el-table-column
+                             v-if="isColumnShow('storeId')"
+                             prop="storeId"
+                             label="店铺"
+                             min-width="70">
+            </el-table-column>
+
+            <el-table-column
+                             v-if="isColumnShow('typeFlag')"
+                             prop="typeFlag"
+                             :formatter="TypeFlagFormatter"
+                             label="类型"
+                             min-width="70">
+            </el-table-column>
+
+            <el-table-column
+                             v-if="isColumnShow('productId')"
+                             prop="productId"
+                             label="商品"
+                             min-width="70">
+            </el-table-column>
+
+            <el-table-column
+                             v-if="isColumnShow('productName')"
+                             prop="productName"
+                             label="商品名"
+                             min-width="100">
+            </el-table-column>
+
+            <el-table-column
+                             v-if="isColumnShow('quantity')"
+                             prop="quantity"
+                             label="数量"
+                             min-width="50">
+            </el-table-column>
+
+            <el-table-column
+                             v-if="isColumnShow('totalPrice')"
+                             prop="totalPrice"
+                             label="总价格"
+                             min-width="70">
+            </el-table-column>
+
+            <el-table-column
+                             v-if="isColumnShow('dealPrice')"
+                             prop="dealPrice"
+                             label="支付价格"
+                             min-width="70">
+            </el-table-column>
+
+            <el-table-column
+                             v-if="isColumnShow('payMode')"
+                             prop="payMode"
+                             :formatter="PayModeFormatter"
+                             label="支付方式"
+                             min-width="70">
+            </el-table-column>
+
+            <el-table-column
+                             v-if="isColumnShow('message')"
+                             prop="message"
+                             label="留言"
+                             min-width="100">
+            </el-table-column>
+
+            <el-table-column
+                             v-if="isColumnShow('useType')"
+                             prop="useType"
+                             label="消费方式"
+                             min-width="100">
+            </el-table-column>
+
+            <el-table-column
+                             v-if="isColumnShow('bookPhotoTime')"
+                             prop="bookPhotoTime"
+                             label="预约拍照时间"
+                             :formatter="DateTimeFormatter"
+                             min-width="100">
+            </el-table-column>
+
+            <el-table-column
+                             v-if="isColumnShow('photoTime')"
+                             prop="photoTime"
+                             label="拍照时间"
+                             :formatter="DateTimeFormatter"
+                             min-width="100">
+            </el-table-column>
+
+            <el-table-column
+                             v-if="isColumnShow('bookSelectTime')"
+                             prop="bookSelectTime"
+                             label="预约选片时间"
+                             :formatter="DateTimeFormatter"
+                             min-width="100">
+            </el-table-column>
+
+            <el-table-column
+                             v-if="isColumnShow('selectTime')"
+                             prop="selectTime"
+                             label="选片时间"
+                             :formatter="DateTimeFormatter"
+                             min-width="100">
+            </el-table-column>
+
+            <el-table-column
+                             v-if="isColumnShow('bookCheckTime')"
+                             prop="bookCheckTime"
+                             label="预约审片时间"
+                             :formatter="DateTimeFormatter"
+                             min-width="100">
+            </el-table-column>
+
+            <el-table-column
+                             v-if="isColumnShow('checkTime')"
+                             prop="checkTime"
+                             label="审片时间"
+                             :formatter="DateTimeFormatter"
+                             min-width="100">
+            </el-table-column>
+
+            <el-table-column
+                             v-if="isColumnShow('bookAccessTime')"
+                             prop="bookAccessTime"
+                             label="预约取件时间"
+                             :formatter="DateTimeFormatter"
+                             min-width="100">
+            </el-table-column>
+
+            <el-table-column
+                             v-if="isColumnShow('accessTime')"
+                             prop="accessTime"
+                             label="取件时间"
+                             :formatter="DateTimeFormatter"
+                             min-width="100">
+            </el-table-column>
+
+            <el-table-column
+                             v-if="isColumnShow('commentTime')"
+                             prop="commentTime"
+                             label="评论时间"
+                             :formatter="DateTimeFormatter"
+                             min-width="100">
+            </el-table-column>
+
+            <el-table-column
+                             v-if="isColumnShow('downPayment')"
+                             prop="downPayment"
+                             label="定金"
+                             min-width="70">
+            </el-table-column>
+
+            <el-table-column
+                             v-if="isColumnShow('unitPrice')"
+                             prop="unitPrice"
+                             label="单价"
+                             min-width="70">
+            </el-table-column>
+
+            <el-table-column
+                             v-if="isColumnShow('offPrice')"
+                             prop="offPrice"
+                             label="减价格"
+                             min-width="70">
+            </el-table-column>
+
+            <el-table-column
+                             v-if="isColumnShow('couponPrice')"
+                             prop="couponPrice"
+                             label="优惠价格"
+                             min-width="70">
+            </el-table-column>
+
+            <el-table-column
+                             v-if="isColumnShow('payTime')"
+                             prop="payTime"
+                             label="支付时间"
+                             :formatter="DateTimeFormatter"
+                             min-width="100">
+            </el-table-column>
+
+            <el-table-column
+                             v-if="isColumnShow('remark')"
+                             prop="remark"
+                             label="备注"
+                             min-width="100">
+            </el-table-column>
+
+            <el-table-column
+                             v-if="isColumnShow('showFlag')"
+                             prop="showFlag"
+                             label="前端显示"
+                             min-width="50">
+            </el-table-column>
+
+            <el-table-column
+                             v-if="isColumnShow('fee')"
+                             prop="fee"
+                             label="手续费"
+                             min-width="50">
+            </el-table-column>
+
+            <el-table-column
+                             v-if="isColumnShow('coin')"
+                             prop="coin"
+                             label="余额"
+                             min-width="70">
+            </el-table-column>
+
+            <el-table-column
+                             v-if="isColumnShow('point')"
+                             prop="point"
+                             label="积分"
+                             min-width="70">
+            </el-table-column>
+
+            <el-table-column
+                             v-if="isColumnShow('cash')"
+                             prop="cash"
+                             label="现金"
+                             min-width="70">
+            </el-table-column>
+
+            <el-table-column
+                             v-if="isColumnShow('userAddressId')"
+                             prop="userAddressId"
+                             label="地址Id"
+                             min-width="70">
+            </el-table-column>
+
+            <el-table-column
+                             v-if="isColumnShow('serviceId')"
+                             prop="serviceId"
+                             label="店铺服务"
+                             min-width="70">
+            </el-table-column>
+
+            <el-table-column
+                             v-if="isColumnShow('message')"
+                             prop="message"
+                             label="留言"
+                             min-width="100">
+            </el-table-column>
+
+            <el-table-column
+                             v-if="isColumnShow('useType')"
+                             prop="useType"
+                             label="消费方式"
+                             min-width="100">
+            </el-table-column>
+
+            <el-table-column
+                             v-if="isColumnShow('orderId')"
+                             prop="orderId"
+                             label="订单Id"
+                             min-width="100">
+            </el-table-column>
+
+            <el-table-column
+                             v-if="isColumnShow('tailMoney')"
+                             prop="tailMoney"
+                             label="尾款"
+                             min-width="100">
+            </el-table-column>
+
+            <el-table-column
+                             label="操作"
+                             align="center"
+                             fixed="right"
+                             min-width="150">
                 <template slot-scope="scope">
-                                        <el-button @click="editRow(scope.row)" type="primary" size="mini" plain>编辑</el-button>
+                    <el-button @click="editRow(scope.row)" type="primary" size="mini" plain>编辑</el-button>
                     <el-button @click="deleteRow(scope.row)" type="danger" size="mini" plain>删除</el-button>
                 </template>
             </el-table-column>
@@ -341,14 +368,14 @@
                 </el-button-group>
             </div>
             <el-pagination
-                    background
-                    @size-change="pageSizeChange"
-                    @current-change="currentPageChange"
-                    :current-page="currentPage"
-                    :page-sizes="[10, 20, 30, 40, 50]"
-                    :page-size="pageSize"
-                    layout="total, sizes, prev, pager, next, jumper"
-                    :total="totalNumber">
+                           background
+                           @size-change="pageSizeChange"
+                           @current-change="currentPageChange"
+                           :current-page="currentPage"
+                           :page-sizes="[10, 20, 30, 40, 50]"
+                           :page-size="pageSize"
+                           layout="total, sizes, prev, pager, next, jumper"
+                           :total="totalNumber">
             </el-pagination>
         </div>
         <el-dialog title="高级查询" :visible.sync="showAdvancedQueryDialog">
@@ -443,568 +470,724 @@
     </div>
 </template>
 <script>
-    import {mapState} from 'vuex'
-    import {format} from 'date-fns'
-    import zh from 'date-fns/locale/zh_cn'
+import { mapState } from 'vuex';
+import { format } from 'date-fns';
+import zh from 'date-fns/locale/zh_cn';
 
-    export default {
-        name: 'UserOrderDetails',
-        created() {
-            this.getData();
+export default {
+    name: 'UserOrderDetails',
+    created() {
+        this.getData();
+
+        this.$http
+            .get({
+                url: '/storeInfo/all',
+            })
+            .then(res => {
+                if (res.success) {
+                    this.storeInfos = res.data;
+                }
+            });
+
+        this.$http
+            .get({
+                url: '/userInfo/all',
+            })
+            .then(res => {
+                if (res.success) {
+                    this.userInfos = res.data;
+                }
+            });
+    },
+    data() {
+        return {
+            totalNumber: 0,
+            totalPage: 10,
+            currentPage: 1,
+            pageSize: 20,
+            tableData: [],
+            filter1: '',
+            filter2: '',
+            tableColumns: [
+                {
+                    label: 'ID',
+                    value: 'id',
+                    show: true,
+                },
+                {
+                    label: '用户',
+                    value: 'userId',
+                    show: true,
+                },
+                {
+                    label: '订单号',
+                    value: 'orderCode',
+                    show: true,
+                },
+                {
+                    label: '店铺',
+                    value: 'storeId',
+                    show: true,
+                },
+                {
+                    label: '类型',
+                    value: 'typeFlag',
+                    show: true,
+                },
+                {
+                    label: '商品',
+                    value: 'productId',
+                    show: true,
+                },
+                {
+                    label: '商品名',
+                    value: 'productName',
+                    show: true,
+                },
+                {
+                    label: '定金',
+                    value: 'downPayment',
+                    show: true,
+                },
+                {
+                    label: '单价',
+                    value: 'unitPrice',
+                    show: true,
+                },
+                {
+                    label: '数量',
+                    value: 'quantity',
+                    show: true,
+                },
+                {
+                    label: '减价格',
+                    value: 'offPrice',
+                    show: true,
+                },
+                {
+                    label: '优惠价格',
+                    value: 'couponPrice',
+                    show: true,
+                },
+                {
+                    label: '总价格',
+                    value: 'totalPrice',
+                    show: true,
+                },
+                {
+                    label: '支付价格',
+                    value: 'dealPrice',
+                    show: true,
+                },
+                {
+                    label: '支付方式',
+                    value: 'payMode',
+                    show: true,
+                },
+                {
+                    label: '支付时间',
+                    value: 'payTime',
+                    show: true,
+                },
+                {
+                    label: '备注',
+                    value: 'remark',
+                    show: true,
+                },
+                {
+                    label: '前端显示',
+                    value: 'showFlag',
+                    show: true,
+                },
+                {
+                    label: '状态',
+                    value: 'statusFlag',
+                    show: true,
+                },
+                {
+                    label: '手续费',
+                    value: 'fee',
+                    show: true,
+                },
+                {
+                    label: '余额',
+                    value: 'coin',
+                    show: true,
+                },
+                {
+                    label: '积分',
+                    value: 'point',
+                    show: true,
+                },
+                {
+                    label: '现金',
+                    value: 'cash',
+                    show: true,
+                },
+                {
+                    label: '地址Id',
+                    value: 'userAddressId',
+                    show: true,
+                },
+                {
+                    label: '店铺服务',
+                    value: 'serviceId',
+                    show: true,
+                },
+                {
+                    label: '留言',
+                    value: 'message',
+                    show: true,
+                },
+                {
+                    label: '消费方式',
+                    value: 'useType',
+                    show: true,
+                },
+                {
+                    label: '订单Id',
+                    value: 'orderId',
+                    show: true,
+                },
+                {
+                    label: '尾款',
+                    value: 'tailMoney',
+                    show: true,
+                },
+                {
+                    label: '预约拍照时间',
+                    value: 'bookPhotoTime',
+                    show: true,
+                },
+                {
+                    label: '拍照时间',
+                    value: 'photoTime',
+                    show: true,
+                },
+                {
+                    label: '预约选片时间',
+                    value: 'bookSelectTime',
+                    show: true,
+                },
+                {
+                    label: '选片时间',
+                    value: 'selectTime',
+                    show: true,
+                },
+                {
+                    label: '预约审片时间',
+                    value: 'bookCheckTime',
+                    show: true,
+                },
+                {
+                    label: '审片时间',
+                    value: 'checkTime',
+                    show: true,
+                },
+                {
+                    label: '预约取件时间',
+                    value: 'bookAccessTime',
+                    show: true,
+                },
+                {
+                    label: '取件时间',
+                    value: 'accessTime',
+                    show: true,
+                },
+                {
+                    label: '评论时间',
+                    value: 'commentTime',
+                    show: true,
+                },
+            ],
+            multipleMode: false,
+            showAdvancedQueryDialog: false,
+            advancedQueryFields: [],
+            showTableSortDialog: false,
+            tableSortFields: [],
+            searchMethods: ['=', '!=', '>', '>=', '<', '<=', 'like'],
+            advancedQueryColumns: [
+                {
+                    label: 'ID',
+                    value: 'id',
+                },
+                {
+                    label: '用户',
+                    value: 'user_id',
+                },
+                {
+                    label: '订单号',
+                    value: 'order_code',
+                },
+                {
+                    label: '店铺',
+                    value: 'store_id',
+                },
+                {
+                    label: '类型',
+                    value: 'type_flag',
+                },
+                {
+                    label: '商品',
+                    value: 'product_id',
+                },
+                {
+                    label: '商品名',
+                    value: 'product_name',
+                },
+                {
+                    label: '定金',
+                    value: 'down_payment',
+                },
+                {
+                    label: '单价',
+                    value: 'unit_price',
+                },
+                {
+                    label: '数量',
+                    value: 'quantity',
+                },
+                {
+                    label: '减价格',
+                    value: 'off_price',
+                },
+                {
+                    label: '优惠价格',
+                    value: 'coupon_price',
+                },
+                {
+                    label: '总价格',
+                    value: 'total_price',
+                },
+                {
+                    label: '支付价格',
+                    value: 'deal_price',
+                },
+                {
+                    label: '支付方式',
+                    value: 'pay_mode',
+                },
+                {
+                    label: '支付时间',
+                    value: 'pay_time',
+                },
+                {
+                    label: '备注',
+                    value: 'remark',
+                },
+                {
+                    label: '前端显示',
+                    value: 'show_flag',
+                },
+                {
+                    label: '状态',
+                    value: 'status_flag',
+                },
+                {
+                    label: '手续费',
+                    value: 'fee',
+                },
+                {
+                    label: '余额',
+                    value: 'coin',
+                },
+                {
+                    label: '积分',
+                    value: 'point',
+                },
+                {
+                    label: '现金',
+                    value: 'cash',
+                },
+                {
+                    label: '地址Id',
+                    value: 'user_address_id',
+                },
+                {
+                    label: '店铺服务',
+                    value: 'service_id',
+                },
+                {
+                    label: '留言',
+                    value: 'message',
+                },
+                {
+                    label: '消费方式',
+                    value: 'use_type',
+                },
+                {
+                    label: '订单Id',
+                    value: 'order_id',
+                },
+                {
+                    label: '尾款',
+                    value: 'tail_money',
+                },
+                {
+                    label: '预约拍照时间',
+                    value: 'book_photo_time',
+                },
+                {
+                    label: '拍照时间',
+                    value: 'photo_time',
+                },
+                {
+                    label: '预约选片时间',
+                    value: 'book_select_time',
+                },
+                {
+                    label: '选片时间',
+                    value: 'select_time',
+                },
+                {
+                    label: '预约审片时间',
+                    value: 'book_check_time',
+                },
+                {
+                    label: '审片时间',
+                    value: 'check_time',
+                },
+                {
+                    label: '预约取件时间',
+                    value: 'book_access_time',
+                },
+                {
+                    label: '取件时间',
+                    value: 'access_time',
+                },
+                {
+                    label: '评论时间',
+                    value: 'comment_time',
+                },
+            ],
+            advancedQuerySearchKey: '',
+            orderByStr: '',
+            imgSrc: '',
+            imageDialogVisible: false,
+            orderStatusOptions: [
+                {
+                    label: '待付款',
+                    value: 0,
+                },
+                {
+                    label: '付款完成',
+                    value: 1,
+                },
+                {
+                    label: '预约拍照',
+                    value: 2,
+                },
+                {
+                    label: '拍照完成',
+                    value: 3,
+                },
+                {
+                    label: '预约选片',
+                    value: 4,
+                },
+                {
+                    label: '选片完成',
+                    value: 5,
+                },
+                {
+                    label: '预约审片',
+                    value: 6,
+                },
+                {
+                    label: '审片完成',
+                    value: 7,
+                },
+                {
+                    label: '预约取件',
+                    value: 8,
+                },
+                {
+                    label: '取件完成',
+                    value: 9,
+                },
+                {
+                    label: '结束',
+                    value: 10,
+                },
+                {
+                    label: '取消',
+                    value: 11,
+                },
+            ],
+
+            storeInfos: [],
+            storeId: '',
+            userInfos: [],
+            userId: '',
+            payModeOptions: [
+                {
+                    label: '支付宝',
+                    value: 0,
+                },
+                {
+                    label: '微信',
+                    value: 1,
+                },
+                {
+                    label: '余额',
+                    value: 2,
+                },
+            ],
+            payModeKey: '',
+            orderStatusKey: '',
+            typeFlagOptions: [
+                {
+                    label: '全款',
+                    value: 0,
+                },
+                {
+                    label: '定金',
+                    value: 1,
+                },
+                {
+                    label: '线下',
+                    value: 2,
+                },
+            ],
+            typeFlagKey: '',
+        };
+    },
+    computed: {
+        ...mapState(['tableHeight']),
+        selection() {
+            return this.$refs.table.selection.map(i => i.id);
         },
-        data() {
-            return {
-                totalNumber: 0,
-                totalPage: 10,
-                currentPage: 1,
-                pageSize: 20,
-                tableData: [],
-                filter1: '',
-                filter2: '',
-                tableColumns: [
-                                                                        {
-                                label: 'ID',
-                                value: 'id',
-                                show: true
-                            },
-                                                                                                                                                                                                                                                                                                                            {
-                                label: '用户',
-                                value: 'userId',
-                                show: true
-                            },
-                                                                                                {
-                                label: '订单号',
-                                value: 'orderCode',
-                                show: true
-                            },
-                                                                                                {
-                                label: '店铺',
-                                value: 'storeId',
-                                show: true
-                            },
-                                                                                                {
-                                label: '类型',
-                                value: 'typeFlag',
-                                show: true
-                            },
-                                                                                                {
-                                label: '商品',
-                                value: 'productId',
-                                show: true
-                            },
-                                                                                                {
-                                label: '商品名',
-                                value: 'productName',
-                                show: true
-                            },
-                                                                                                {
-                                label: '定金',
-                                value: 'downPayment',
-                                show: true
-                            },
-                                                                                                {
-                                label: '单价',
-                                value: 'unitPrice',
-                                show: true
-                            },
-                                                                                                {
-                                label: '数量',
-                                value: 'quantity',
-                                show: true
-                            },
-                                                                                                {
-                                label: '减价格',
-                                value: 'offPrice',
-                                show: true
-                            },
-                                                                                                {
-                                label: '优惠价格',
-                                value: 'couponPrice',
-                                show: true
-                            },
-                                                                                                {
-                                label: '总价格',
-                                value: 'totalPrice',
-                                show: true
-                            },
-                                                                                                {
-                                label: '支付价格',
-                                value: 'dealPrice',
-                                show: true
-                            },
-                                                                                                {
-                                label: '支付方式',
-                                value: 'payMode',
-                                show: true
-                            },
-                                                                                                {
-                                label: '支付时间',
-                                value: 'payTime',
-                                show: true
-                            },
-                                                                                                {
-                                label: '备注',
-                                value: 'remark',
-                                show: true
-                            },
-                                                                                                {
-                                label: '前端显示',
-                                value: 'showFlag',
-                                show: true
-                            },
-                                                                                                {
-                                label: '状态',
-                                value: 'statusFlag',
-                                show: true
-                            },
-                                                                                                {
-                                label: '手续费',
-                                value: 'fee',
-                                show: true
-                            },
-                                                                                                {
-                                label: '余额',
-                                value: 'coin',
-                                show: true
-                            },
-                                                                                                {
-                                label: '积分',
-                                value: 'point',
-                                show: true
-                            },
-                                                                                                {
-                                label: '现金',
-                                value: 'cash',
-                                show: true
-                            },
-                                                                                                {
-                                label: '地址Id',
-                                value: 'userAddressId',
-                                show: true
-                            },
-                                                                                                {
-                                label: '店铺服务',
-                                value: 'serviceId',
-                                show: true
-                            },
-                                                                                                {
-                                label: '留言',
-                                value: 'message',
-                                show: true
-                            },
-                                                                                                {
-                                label: '消费方式',
-                                value: 'useType',
-                                show: true
-                            },
-                                                                                                {
-                                label: '订单Id',
-                                value: 'orderId',
-                                show: true
-                            },
-                                                                                                {
-                                label: '尾款',
-                                value: 'tailMoney',
-                                show: true
-                            },
-                                                                                                {
-                                label: '预约拍照时间',
-                                value: 'bookPhotoTime',
-                                show: true
-                            },
-                                                                                                {
-                                label: '拍照时间',
-                                value: 'photoTime',
-                                show: true
-                            },
-                                                                                                {
-                                label: '预约选片时间',
-                                value: 'bookSelectTime',
-                                show: true
-                            },
-                                                                                                {
-                                label: '选片时间',
-                                value: 'selectTime',
-                                show: true
-                            },
-                                                                                                {
-                                label: '预约审片时间',
-                                value: 'bookCheckTime',
-                                show: true
-                            },
-                                                                                                {
-                                label: '审片时间',
-                                value: 'checkTime',
-                                show: true
-                            },
-                                                                                                {
-                                label: '预约取件时间',
-                                value: 'bookAccessTime',
-                                show: true
-                            },
-                                                                                                {
-                                label: '取件时间',
-                                value: 'accessTime',
-                                show: true
-                            },
-                                                                                                {
-                                label: '评论时间',
-                                value: 'commentTime',
-                                show: true
-                            },
-                                                            ],
-                multipleMode: false,
-                showAdvancedQueryDialog: false,
-                advancedQueryFields: [],
-                showTableSortDialog: false,
-                tableSortFields: [],
-                searchMethods: ['=', '!=', '>', '>=', '<', '<=', 'like'],
-                advancedQueryColumns: [
-                                                                        {
-                                label: 'ID',
-                                value: 'id'
-                            },
-                                                                                                                                                                                                                                                                                                                            {
-                                label: '用户',
-                                value: 'user_id'
-                            },
-                                                                                                {
-                                label: '订单号',
-                                value: 'order_code'
-                            },
-                                                                                                {
-                                label: '店铺',
-                                value: 'store_id'
-                            },
-                                                                                                {
-                                label: '类型',
-                                value: 'type_flag'
-                            },
-                                                                                                {
-                                label: '商品',
-                                value: 'product_id'
-                            },
-                                                                                                {
-                                label: '商品名',
-                                value: 'product_name'
-                            },
-                                                                                                {
-                                label: '定金',
-                                value: 'down_payment'
-                            },
-                                                                                                {
-                                label: '单价',
-                                value: 'unit_price'
-                            },
-                                                                                                {
-                                label: '数量',
-                                value: 'quantity'
-                            },
-                                                                                                {
-                                label: '减价格',
-                                value: 'off_price'
-                            },
-                                                                                                {
-                                label: '优惠价格',
-                                value: 'coupon_price'
-                            },
-                                                                                                {
-                                label: '总价格',
-                                value: 'total_price'
-                            },
-                                                                                                {
-                                label: '支付价格',
-                                value: 'deal_price'
-                            },
-                                                                                                {
-                                label: '支付方式',
-                                value: 'pay_mode'
-                            },
-                                                                                                {
-                                label: '支付时间',
-                                value: 'pay_time'
-                            },
-                                                                                                {
-                                label: '备注',
-                                value: 'remark'
-                            },
-                                                                                                {
-                                label: '前端显示',
-                                value: 'show_flag'
-                            },
-                                                                                                {
-                                label: '状态',
-                                value: 'status_flag'
-                            },
-                                                                                                {
-                                label: '手续费',
-                                value: 'fee'
-                            },
-                                                                                                {
-                                label: '余额',
-                                value: 'coin'
-                            },
-                                                                                                {
-                                label: '积分',
-                                value: 'point'
-                            },
-                                                                                                {
-                                label: '现金',
-                                value: 'cash'
-                            },
-                                                                                                {
-                                label: '地址Id',
-                                value: 'user_address_id'
-                            },
-                                                                                                {
-                                label: '店铺服务',
-                                value: 'service_id'
-                            },
-                                                                                                {
-                                label: '留言',
-                                value: 'message'
-                            },
-                                                                                                {
-                                label: '消费方式',
-                                value: 'use_type'
-                            },
-                                                                                                {
-                                label: '订单Id',
-                                value: 'order_id'
-                            },
-                                                                                                {
-                                label: '尾款',
-                                value: 'tail_money'
-                            },
-                                                                                                {
-                                label: '预约拍照时间',
-                                value: 'book_photo_time'
-                            },
-                                                                                                {
-                                label: '拍照时间',
-                                value: 'photo_time'
-                            },
-                                                                                                {
-                                label: '预约选片时间',
-                                value: 'book_select_time'
-                            },
-                                                                                                {
-                                label: '选片时间',
-                                value: 'select_time'
-                            },
-                                                                                                {
-                                label: '预约审片时间',
-                                value: 'book_check_time'
-                            },
-                                                                                                {
-                                label: '审片时间',
-                                value: 'check_time'
-                            },
-                                                                                                {
-                                label: '预约取件时间',
-                                value: 'book_access_time'
-                            },
-                                                                                                {
-                                label: '取件时间',
-                                value: 'access_time'
-                            },
-                                                                                                {
-                                label: '评论时间',
-                                value: 'comment_time'
-                            },
-                                                            ],
-                advancedQuerySearchKey: '',
-                orderByStr: '',
-                imgSrc: '',
-                imageDialogVisible: false,
-            }
+    },
+    methods: {
+        pageSizeChange(size) {
+            this.currentPage = 1;
+            this.pageSize = size;
+            this.getData();
         },
-        computed: {
-            ...mapState(['tableHeight']),
-            selection() {
-                return this.$refs.table.selection.map(i => i.id);
-            }
+        currentPageChange(page) {
+            this.currentPage = page;
+            this.getData();
         },
-        methods: {
-            pageSizeChange(size) {
-                this.currentPage = 1;
-                this.pageSize = size;
-                this.getData();
-            },
-            currentPageChange(page) {
-                this.currentPage = page;
-                this.getData();
-            },
-            getData() {
-
-                var data = {
-                    currentPage: this.currentPage,
-                    pageNumber: this.pageSize,
-                    searchKey: this.filter1,
-                    advancedQuery: this.advancedQuerySearchKey,
-                    orderByStr: this.orderByStr,
-                }
+        getData() {
+            var data = {
+                currentPage: this.currentPage,
+                pageNumber: this.pageSize,
+                searchKey: this.filter1,
+                advancedQuery: this.advancedQuerySearchKey,
+                orderByStr: this.orderByStr,
+                storeId: this.storeId,
+                userId: this.userId,
+                payMode: this.payModeKey,
+                statusFlag: this.orderStatusKey,
+                typeFlag: this.typeFlagKey,
+            };
 
-                if (this.$route.query.column) {
-                    var tempColumn = this.$route.query.column;
-                    data[tempColumn.split(',')[1]] = tempColumn.split(',')[0];
-                }
+            if (this.$route.query.column) {
+                var tempColumn = this.$route.query.column;
+                data[tempColumn.split(',')[1]] = tempColumn.split(',')[0];
+            }
 
-                this.$http.get({
+            this.$http
+                .get({
                     url: '/userOrderDetail/page',
-                    data: data
-                }).then(res => {
+                    data: data,
+                })
+                .then(res => {
                     if (res.success) {
                         this.totalNumber = res.data.page.totalNumber;
                         this.tableData = res.data.pp;
                     }
-                })
-            },
-            isColumnShow(column) {
-                var row = this.tableColumns.find(i => i.value === column);
-                return row ? row.show : false;
-            },
-            toggleMultipleMode(multipleMode) {
-                this.multipleMode = multipleMode;
-                if (!multipleMode) {
-                    this.$refs.table.clearSelection();
-                }
-            },
-            editRow(row) {
-                this.$router.push({
-                    path: '/userOrderDetail',
-                    query: {
-                        id: row.id,
-                        column: this.$route.query.column,
-                    }
-                })
-            },
-            operation1() {
-                this.$notify({
-                    title: '提示',
-                    message: this.selection
-                });
-            },
-            operation2() {
-                this.$message('操作2');
-            },
-            addField() {
-                this.advancedQueryFields.push({
-                    link: 'AND',
-                    name: '',
-                    searchMethod: '=',
-                    value: '',
                 });
-            },
-            removeField(i) {
-                if (this.advancedQueryFields.length > 0) {
-                    this.advancedQueryFields.splice(i, 1);
-                }
-            },
-            advancedQuery() {
-
-                this.advancedQuerySearchKey = '';
-
-                if (this.advancedQueryFields.length > 0) {
-
-                    var templist = [];
-
-                    this.advancedQueryFields.forEach(item => {
-                        if (item.link && item.name && item.searchMethod && item.value) {
-                            var tempItem = item.link + '_,' + item.name + '_,' + item.searchMethod + '_,' + item.value;
-                            templist.push(tempItem);
-                        }
-                    })
+        },
+        isColumnShow(column) {
+            var row = this.tableColumns.find(i => i.value === column);
+            return row ? row.show : false;
+        },
+        toggleMultipleMode(multipleMode) {
+            this.multipleMode = multipleMode;
+            if (!multipleMode) {
+                this.$refs.table.clearSelection();
+            }
+        },
+        editRow(row) {
+            this.$router.push({
+                path: '/userOrderDetail',
+                query: {
+                    id: row.id,
+                    column: this.$route.query.column,
+                },
+            });
+        },
+        operation1() {
+            this.$notify({
+                title: '提示',
+                message: this.selection,
+            });
+        },
+        operation2() {
+            this.$message('操作2');
+        },
+        addField() {
+            this.advancedQueryFields.push({
+                link: 'AND',
+                name: '',
+                searchMethod: '=',
+                value: '',
+            });
+        },
+        removeField(i) {
+            if (this.advancedQueryFields.length > 0) {
+                this.advancedQueryFields.splice(i, 1);
+            }
+        },
+        advancedQuery() {
+            this.advancedQuerySearchKey = '';
 
-                    if (templist.length > 0) {
+            if (this.advancedQueryFields.length > 0) {
+                var templist = [];
 
-                        this.advancedQuerySearchKey = templist.join('_;');
+                this.advancedQueryFields.forEach(item => {
+                    if (
+                        item.link &&
+                        item.name &&
+                        item.searchMethod &&
+                        item.value
+                    ) {
+                        var tempItem =
+                            item.link +
+                            '_,' +
+                            item.name +
+                            '_,' +
+                            item.searchMethod +
+                            '_,' +
+                            item.value;
+                        templist.push(tempItem);
                     }
-                }
-
-                this.getData();
-                this.showAdvancedQueryDialog = false;
-            },
-            addSortField() {
-                this.tableSortFields.push({
-                    name: '',
-                    order: 'asc',
                 });
-            },
-            removeSortField(i) {
-                if (this.tableSortFields.length > 0) {
-                    this.tableSortFields.splice(i, 1);
-                }
-            },
-            tableSortQuery() {
 
-                this.orderByStr = '';
-
-                if (this.tableSortFields.length > 0) {
-
-                    var templist = [];
+                if (templist.length > 0) {
+                    this.advancedQuerySearchKey = templist.join('_;');
+                }
+            }
 
-                    this.tableSortFields.forEach(item => {
-                        if (item.name && item.order) {
-                            var tempItem = item.name + '_,' + item.order;
-                            templist.push(tempItem);
-                        }
-                    })
+            this.getData();
+            this.showAdvancedQueryDialog = false;
+        },
+        addSortField() {
+            this.tableSortFields.push({
+                name: '',
+                order: 'asc',
+            });
+        },
+        removeSortField(i) {
+            if (this.tableSortFields.length > 0) {
+                this.tableSortFields.splice(i, 1);
+            }
+        },
+        tableSortQuery() {
+            this.orderByStr = '';
 
-                    if (templist.length > 0) {
+            if (this.tableSortFields.length > 0) {
+                var templist = [];
 
-                        this.orderByStr = templist.join('_;');
+                this.tableSortFields.forEach(item => {
+                    if (item.name && item.order) {
+                        var tempItem = item.name + '_,' + item.order;
+                        templist.push(tempItem);
                     }
+                });
+
+                if (templist.length > 0) {
+                    this.orderByStr = templist.join('_;');
                 }
+            }
 
-                this.getData();
-                this.showTableSortDialog = false;
-            },
-            exportExcel() {
-                window.location.href = this.$baseUrl + "/userOrderDetail/exportExcel?searchKey="
-                        + this.filter1 + "&advancedQuery=" + this.advancedQuerySearchKey+"&orderByStr=" + this.orderByStr;
-            },
-            searchData() {
-                this.currentPage = 1;
-                this.getData();
-            },
-            deleteRow(row) {
-                this.$alert('删除将无法恢复,确认要删除么?', '警告', {type: 'error'}).then(() => {
+            this.getData();
+            this.showTableSortDialog = false;
+        },
+        exportExcel() {
+            window.location.href =
+                this.$baseUrl +
+                '/userOrderDetail/exportExcel?searchKey=' +
+                this.filter1 +
+                '&advancedQuery=' +
+                this.advancedQuerySearchKey +
+                '&orderByStr=' +
+                this.orderByStr;
+        },
+        searchData() {
+            this.currentPage = 1;
+            this.getData();
+        },
+        deleteRow(row) {
+            this.$alert('删除将无法恢复,确认要删除么?', '警告', {
+                type: 'error',
+            })
+                .then(() => {
                     return this.$http.post({
                         url: '/userOrderDetail/del',
-                        data: {id: row.id}
-                    })
-                }).then(() => {
+                        data: { id: row.id },
+                    });
+                })
+                .then(() => {
                     this.$message.success('删除成功');
                     this.getData();
-                }).catch(action => {
+                })
+                .catch(action => {
                     if (action === 'cancel') {
                         this.$message.info('删除取消');
                     } else {
                         this.$message.error('删除失败');
                     }
-                })
-            },
-            DateTimeFormatter(row, column, cellValue) {
-                if (cellValue) {
-                    return format(cellValue, 'YYYY/MM/DD HH:mm', {locale: zh})
+                });
+        },
+        DateTimeFormatter(row, column, cellValue) {
+            if (cellValue) {
+                return format(cellValue, 'YYYY/MM/DD HH:mm', { locale: zh });
+            }
+        },
+        DateFormatter(row, column, cellValue) {
+            if (cellValue) {
+                return format(cellValue, 'YYYY/MM/DD', { locale: zh });
+            }
+        },
+        showImg(img) {
+            this.imgSrc = img;
+            this.imageDialogVisible = true;
+        },
+        StatusFlagFormatter(row, column, cellValue) {
+            var valueStr = '';
+
+            this.orderStatusOptions.forEach(item => {
+                if (item.value == cellValue) {
+                    valueStr = item.label;
                 }
+            });
 
-            },
-            DateFormatter(row, column, cellValue) {
-                if (cellValue) {
-                    return format(cellValue, 'YYYY/MM/DD', {locale: zh})
+            return valueStr;
+        },
+        PayModeFormatter(row, column, cellValue) {
+            var valueStr = '';
+            this.payModeOptions.forEach(item => {
+                if (item.value == cellValue) {
+                    valueStr = item.label;
                 }
+            });
 
-            },
-            showImg(img) {
-                this.imgSrc = img;
-                this.imageDialogVisible = true;
-            },
+            return valueStr;
+        },
+        TypeFlagFormatter(row, column, cellValue) {
+            var valueStr = '';
+            this.typeFlagOptions.forEach(item => {
+                if (item.value == cellValue) {
+                    valueStr = item.label;
+                }
+            });
 
-        }
-    }
+            return valueStr;
+        },
+    },
+};
 </script>
 <style lang="less" scoped>
-
 </style>

+ 132 - 5
src/main/vue/src/pages/UserOrders.vue

@@ -2,6 +2,19 @@
     <div>
         <div class="filters-container">
 
+            <el-select v-model="storeId" size="small" clearable filterable placeholder="店铺" @change="searchData" style="width:120px">
+                <el-option v-for="item in storeInfos" :key="item.id" :label="item.storeName" :value="item.id"></el-option>
+            </el-select>
+            <el-select v-model="userId" size="small" clearable filterable placeholder="用户" @change="searchData" style="width:120px">
+                <el-option v-for="item in userInfos" :key="item.id" :label="item.nickname" :value="item.id"></el-option>
+            </el-select>
+            <el-select v-model="payModeKey" size="small" clearable filterable placeholder="支付方式" @change="searchData" style="width:120px">
+                <el-option v-for="item in payModeOptions" :key="item.value" :label="item.label" :value="item.value"></el-option>
+            </el-select>
+            <el-select v-model="orderStatusKey" size="small" clearable filterable placeholder="订单状态" @change="searchData" style="width:120px">
+                <el-option v-for="item in orderStatusOptions" :key="item.value" :label="item.label" :value="item.value"></el-option>
+            </el-select>
+
             <el-input placeholder="关键字" size="small" v-model="filter1" clearable class="filter-item"></el-input>
             <el-button @click="searchData" type="primary" size="small" icon="el-icon-search" class="filter-item">搜索
             </el-button>
@@ -38,11 +51,6 @@
                              type="selection"
                              width="50">
             </el-table-column>
-            <el-table-column
-                             type="index"
-                             min-width="50"
-                             align="center">
-            </el-table-column>
 
             <el-table-column
                              v-if="isColumnShow('id')"
@@ -54,6 +62,7 @@
             <el-table-column
                              v-if="isColumnShow('statusFlag')"
                              prop="statusFlag"
+                             :formatter="StatusFlagFormatter"
                              label="状态"
                              min-width="100">
             </el-table-column>
@@ -97,6 +106,7 @@
                              v-if="isColumnShow('payMode')"
                              prop="payMode"
                              label="支付方式"
+                             :formatter="PayModeFormatter"
                              min-width="100">
             </el-table-column>
 
@@ -330,6 +340,26 @@ export default {
     name: 'UserOrders',
     created() {
         this.getData();
+
+        this.$http
+            .get({
+                url: '/storeInfo/all',
+            })
+            .then(res => {
+                if (res.success) {
+                    this.storeInfos = res.data;
+                }
+            });
+
+        this.$http
+            .get({
+                url: '/userInfo/all',
+            })
+            .then(res => {
+                if (res.success) {
+                    this.userInfos = res.data;
+                }
+            });
     },
     data() {
         return {
@@ -552,6 +582,77 @@ export default {
             orderByStr: '',
             imgSrc: '',
             imageDialogVisible: false,
+            orderStatusOptions: [
+                {
+                    label: '待付款',
+                    value: 0,
+                },
+                {
+                    label: '付款完成',
+                    value: 1,
+                },
+                {
+                    label: '预约拍照',
+                    value: 2,
+                },
+                {
+                    label: '拍照完成',
+                    value: 3,
+                },
+                {
+                    label: '预约选片',
+                    value: 4,
+                },
+                {
+                    label: '选片完成',
+                    value: 5,
+                },
+                {
+                    label: '预约审片',
+                    value: 6,
+                },
+                {
+                    label: '审片完成',
+                    value: 7,
+                },
+                {
+                    label: '预约取件',
+                    value: 8,
+                },
+                {
+                    label: '取件完成',
+                    value: 9,
+                },
+                {
+                    label: '结束',
+                    value: 10,
+                },
+                {
+                    label: '取消',
+                    value: 11,
+                },
+            ],
+
+            storeInfos: [],
+            storeId: '',
+            userInfos: [],
+            userId: '',
+            payModeOptions: [
+                {
+                    label: '支付宝',
+                    value: 0,
+                },
+                {
+                    label: '微信',
+                    value: 1,
+                },
+                {
+                    label: '余额',
+                    value: 2,
+                },
+            ],
+            payModeKey: '',
+            orderStatusKey: '',
         };
     },
     computed: {
@@ -577,6 +678,10 @@ export default {
                 searchKey: this.filter1,
                 advancedQuery: this.advancedQuerySearchKey,
                 orderByStr: this.orderByStr,
+                storeId: this.storeId,
+                userId: this.userId,
+                payMode: this.payModeKey,
+                statusFlag: this.orderStatusKey,
             };
 
             if (this.$route.query.column) {
@@ -752,6 +857,28 @@ export default {
             this.imgSrc = img;
             this.imageDialogVisible = true;
         },
+
+        StatusFlagFormatter(row, column, cellValue) {
+            var valueStr = '';
+
+            this.orderStatusOptions.forEach(item => {
+                if (item.value == cellValue) {
+                    valueStr = item.label;
+                }
+            });
+
+            return valueStr;
+        },
+        PayModeFormatter(row, column, cellValue) {
+            var valueStr = '';
+            this.payModeOptions.forEach(item => {
+                if (item.value == cellValue) {
+                    valueStr = item.label;
+                }
+            });
+
+            return valueStr;
+        },
     },
 };
 </script>

Some files were not shown because too many files changed in this diff