zhang song преди 6 години
родител
ревизия
c45e6eeeee
променени са 5 файла, в които са добавени 118 реда и са изтрити 41 реда
  1. 1 1
      dist/index.html
  2. 13 12
      src/components/home.vue
  3. 1 1
      src/components/login.vue
  4. 100 20
      src/components/order.vue
  5. 3 7
      src/components/orderDetails.vue

+ 1 - 1
dist/index.html

@@ -1 +1 @@
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>经销商管理系统</title><link href=/static/css/app.c5e840abf36a42832385f3866d376165.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.2ae2e69a05c33dfc65f8.js></script><script type=text/javascript src=/static/js/vendor.8eeaeadc93aa4929ae06.js></script><script type=text/javascript src=/static/js/app.412bfd749aafacea63a2.js></script></body></html>
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>经销商管理系统</title><link href=/static/css/app.972a2709c29d38eab92588c07a4aaa48.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.2ae2e69a05c33dfc65f8.js></script><script type=text/javascript src=/static/js/vendor.8eeaeadc93aa4929ae06.js></script><script type=text/javascript src=/static/js/app.ee83f0db2158e6985dba.js></script></body></html>

+ 13 - 12
src/components/home.vue

@@ -7,23 +7,24 @@
                     <!--          <img src="http://shopimg.jetour.com.cn/20190729/1564402058621.jpg" />-->
                 </div>
                 <el-menu :default-active="getMenuIndex()" class="el-menu-vertical-demo">
-                    <el-menu-item :index="'1'" @click="showMenu('全款订单','fullPay',1)">
+                    <el-menu-item :index="'4'" @click="showMenu('普通订单','order',4)">
                         <i class="el-icon-menu"></i>
-                        <span slot="title">全款订单</span>
+                        <span slot="title">普通订单</span>
                     </el-menu-item>
-
-                    <el-menu-item :index="'2'" @click="showMenu('贷款订单','loanPay',2)">
+                    <el-menu-item :index="'1'" @click="showMenu('Coupe全款订单','fullPay',1)">
                         <i class="el-icon-menu"></i>
-                        <span slot="title">款订单</span>
+                        <span slot="title">Coupe全款订单</span>
                     </el-menu-item>
-                    <el-menu-item :index="'3'" @click="showMenu('退订订单','unsubscribe',3)">
+
+                    <el-menu-item :index="'2'" @click="showMenu('Coupe贷款订单','loanPay',2)">
                         <i class="el-icon-menu"></i>
-                        <span slot="title">退订订单</span>
+                        <span slot="title">Coupe贷款订单</span>
                     </el-menu-item>
-                    <el-menu-item :index="'4'" @click="showMenu('普通订单','order',4)">
+                    <el-menu-item :index="'3'" @click="showMenu('Coupe退订订单','unsubscribe',3)">
                         <i class="el-icon-menu"></i>
-                        <span slot="title">普通订单</span>
+                        <span slot="title">Coupe退订订单</span>
                     </el-menu-item>
+
                 </el-menu>
 
             </el-aside>
@@ -52,16 +53,16 @@
         data() {
             return {
                 menuList: [],
-                currentMenu: localStorage.getItem("menuName") == "" ? '全款订单' : localStorage.getItem("menuName"),
+                currentMenu: localStorage.getItem("menuName") == "" ? '普通订单' : localStorage.getItem("menuName"),
                 sysUser: "",
-                menuIndex: localStorage.getItem("menuIndex") == "" ? "'1'" : localStorage.getItem("menuIndex"),
+                menuIndex: localStorage.getItem("menuIndex") == "" ? "'4'" : localStorage.getItem("menuIndex"),
                 username: localStorage.getItem('zptoken'),
             };
         },
 
         methods: {
             getMenuIndex() {
-                var index = localStorage.getItem("menuIndex") == null ? "1" : localStorage.getItem("menuIndex");
+                var index = localStorage.getItem("menuIndex") == null ? "4" : localStorage.getItem("menuIndex");
                 return index;
             },
             showMenu(name, path, menuindex) {

+ 1 - 1
src/components/login.vue

@@ -129,7 +129,7 @@
                                         JSON.stringify(response.data.data)
                                     );
                                     this.$router.push({
-                                        path: "/home/fullPay"
+                                        path: "/home/order"
                                     });
                                 } else if (response.data.success == false) {
                                     this.$message.error(response.data.error);

+ 100 - 20
src/components/order.vue

@@ -2,9 +2,20 @@
     <div id="table">
         <el-row>
             <el-col :span="24">
-
-                <!--                <el-button type="primary" @click="getRows">搜索</el-button>-->
-                <!--                <el-button type="warning" @click="refreshTable">清空</el-button>-->
+                <el-input v-model="queryData.orderCode" placeholder="订单号" style="width: 150px"></el-input>
+                <el-input v-model="queryData.customerName" placeholder="注册账户(手机号)" style="width: 150px"></el-input>
+                <el-input v-model="queryData.receiptMobile" placeholder="收货人手机号" style="width: 150px"></el-input>
+                <el-input v-model="queryData.receiptName" placeholder="收货人姓名" style="width: 150px"></el-input>
+                <el-select v-model="queryData.status" filterable placeholder="请选择订单状态">
+                    <el-option
+                            v-for="item in orderStatusSelect"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value">
+                    </el-option>
+                </el-select>
+                <el-button type="primary" @click="getRows">搜索</el-button>
+                <el-button type="warning" @click="refreshTable">清空</el-button>
             </el-col>
         </el-row>
         <el-table :data="tableData" ref="table" :height="autoHeight" border stripe v-loading="loading"
@@ -13,16 +24,48 @@
             <el-table-column
                     prop="orderCode"
                     label="订单号"
+                    width="200px"
                     align="center">
             </el-table-column>
+            <el-table-column
+                    prop="status"
+                    label="订单状态"
+                    align="center">
+                <template slot-scope="scope">
+                    {{orderStatusOptions[scope.row.status-1].label}}
+                </template>
+            </el-table-column>
             <el-table-column
                     prop="customerName"
-                    label="买家"
+                    label="注册账户"
+                    align="center"
+                    width="200px"
+            >
+            </el-table-column>
+            <el-table-column
+                    prop="receiptName"
+                    label="收货人姓名"
+                    width="150px"
+                    align="center">
+            </el-table-column>
+            <el-table-column
+                    prop="receiptMobile"
+                    label="收货人手机号"
+                    width="200px"
                     align="center">
             </el-table-column>
+            <el-table-column
+                    prop="address"
+                    label="收货人地址"
+                    align="center"
+                    width="200"
+                    show-overflow-tooltip
+            >
+            </el-table-column>
             <el-table-column
                     prop="createTime"
                     label="下单时间"
+                    width="200px"
                     align="center">
             </el-table-column>
             <el-table-column
@@ -38,14 +81,7 @@
                     label="订单总额"
                     align="center">
             </el-table-column>
-            <el-table-column
-                    prop="status"
-                    label="订单状态"
-                    align="center">
-                <template slot-scope="scope">
-                    {{orderStatusOptions[scope.row.status-1].label}}
-                </template>
-            </el-table-column>
+
             <el-table-column
                     prop="payType"
                     label="支付方式	"
@@ -64,7 +100,7 @@
             </el-table-column>
             <el-table-column label="操作 " width="160px" fixed="right" align="center">
                 <template slot-scope="scope">
-                    <el-button @click="orderDetails(scope.row.id)" type="success" round >查看</el-button>
+                    <el-button @click="orderDetails(scope.row.id)" type="success" round>查看</el-button>
                 </template>
             </el-table-column>
         </el-table>
@@ -102,7 +138,13 @@
                     loanStatus: '',  // 状态
                     downPaymentRate: ''  // 比例
                 },
-                queryData: {},
+                queryData: {
+                    status:'',//订单状态
+                    orderCode: '', //订单号
+                    customerMobile: '', //注册手机号
+                    receiptMobile: '', //收货人手机号
+                    receiptName: '',//收货人姓名
+                },
                 sourceOptions: [
                     {
                         value: '1',
@@ -128,19 +170,51 @@
                     {
                         value: '1',
                         label: "待付款"
-                    }, {
+                    },
+                    {
                         value: '2',
-                        label: "发货"
+                        label: "发货"
                     }, {
                         value: '3',
-                        label: "收货"
+                        label: "收货"
                     }, {
                         value: '4',
                         label: "已完成"
-                    }, {
+                    },
+                    {
                         value: '5',
                         label: "取消订单"
+                    },
+
+                    {
+                        value: '6',
+                        label: "退款通过"
+                    }, {
+                        value: '7',
+                        label: "退货通过"
+                    },
+                ],
+                orderStatusSelect: [
+                    // {
+                    //     value: '1',
+                    //     label: "待付款"
+                    // },
+                    {
+                        value: '2',
+                        label: "待发货"
+                    }, {
+                        value: '3',
+                        label: "待收货"
                     }, {
+                        value: '4',
+                        label: "已完成"
+                    },
+                    // {
+                    //     value: '5',
+                    //     label: "取消订单"
+                    // },
+
+                    {
                         value: '6',
                         label: "退款通过"
                     }, {
@@ -196,6 +270,12 @@
         methods: {
             getRows() {
                 let data = {
+
+                    orderCode: this.queryData.orderCode,
+                    customerName: this.queryData.customerName,
+                    receiptMobile: this.queryData.receiptMobile,
+                    receiptName: this.queryData.receiptName,
+                    status: this.queryData.status,
                     currentPage: this.currentPage,
                     pageNumber: this.pageSize
                 };
@@ -215,8 +295,8 @@
                     }
                 );
             },
-            orderDetails(id){
-                this.$router.push({path: '/home/orderDetails', query: {id:id}})
+            orderDetails(id) {
+                this.$router.push({path: '/home/orderDetails', query: {id: id}})
             },
             refreshTable() {
                 this.queryData = {};

+ 3 - 7
src/components/orderDetails.vue

@@ -1,6 +1,6 @@
 <!--suppress ALL -->
 <template height="800px">
-    <div>
+    <div class="icard">
         <el-steps :active=this.active align-center>
             <el-step title="已下单">
                 <template slot="description">
@@ -23,7 +23,7 @@
                 </template>
             </el-step>
         </el-steps>
-        <div class="icard">
+        <div >
             <el-card class="box-card">
                 <div slot="header" class="clearfix">
                     订单概况
@@ -132,10 +132,6 @@
                                     {{orderData.orderAttr.receiptName}}
                                 </el-form-item>
                             </el-col>
-                            <el-col :span="8">
-                                <el-form-item label="联系电话:">
-                                </el-form-item>
-                            </el-col>
                             <el-col :span="8">
                                 <el-form-item label="手机:">
                                     {{orderData.orderAttr.receiptMobile}}
@@ -332,6 +328,6 @@
 
     .icard {
         overflow-y: auto;
-        height: 600px;
+        height: 100%;
     }
 </style>