chenrui há 4 anos atrás
pai
commit
90a25ce3bb

+ 37 - 0
src/api/order.js

@@ -0,0 +1,37 @@
+import { axios } from '@/utils/request'
+
+// 订单列表
+export const orderList = (params) => {
+  const url = `/order/queryPage/${params.pageNo}/${params.pageSize}`
+  delete params.pageNo
+  delete params.pageSize
+  return axios.request({
+    url: url,
+    data: params,
+    method: 'post'
+  })
+}
+// 订单详情
+export const orderFind = (params) => {
+  return axios.request({
+    url: `/order/findById/${params.id}`,
+    method: 'get'
+  })
+}
+//  根据供应商查订单
+export const offPartnerOrderFind = (params) => {
+  return axios.request({
+    url: '/offPartnerOrder/findByGroupExpress',
+    data: params,
+    method: 'post'
+  })
+}
+//  填写物流信息
+//  快递公司
+export const expressCompanyQuery = (params) => {
+  return axios.request({
+    url: '/expressCompany/query',
+    data: params,
+    method: 'post'
+  })
+}

+ 3 - 3
src/api/tenants.js

@@ -43,7 +43,7 @@ export const getProvince = () => {
     url: `/area/PROVINCE`,
     headers: {
       'USER-TERM-TYPE': 'pc',
-      'App-Type': 2
+      'App-Type': 9
     },
     method: 'get'
   })
@@ -54,7 +54,7 @@ export const getCityByPro = params => {
     url: `/area/CITY/${params.id}`,
     headers: {
       'USER-TERM-TYPE': 'pc',
-      'App-Type': 2
+      'App-Type': 9
     },
     method: 'get'
   })
@@ -65,7 +65,7 @@ export const getDistrictByCity = params => {
     url: `/area/DISTRICT/${params.id}`,
     headers: {
       'USER-TERM-TYPE': 'pc',
-      'App-Type': 2
+      'App-Type': 9
     },
     method: 'get'
   })

+ 1 - 1
src/utils/request.js

@@ -38,7 +38,7 @@ const err = (error) => {
 // request interceptor
 service.interceptors.request.use(config => {
   const token = store.getters.token
-  config.headers['App-Type'] = 8 // 平台类型
+  config.headers['App-Type'] = 9 // 平台类型
   if (token) {
     config.headers['access-token'] = token // 让每个请求携带自定义 token 请根据实际情况自行修改
   }

+ 3 - 3
src/views/equipmentManage/equipment/equipment.vue

@@ -5,7 +5,7 @@
         <a-row :gutter="48">
           <a-col :span="6">
             <a-form-item label="设备编号" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
-              <a-input id="equipment-deviceNo" allowClear :maxLength="30" v-model="queryParam.deviceNo" placeholder="请输入网点名称" />
+              <a-input id="equipment-srcDeviceCode" allowClear :maxLength="30" v-model="queryParam.srcDeviceCode" placeholder="请输入设备编号" />
             </a-form-item>
           </a-col>
           <a-col :span="6">
@@ -71,7 +71,7 @@ export default {
       },
       // 查询参数
       queryParam: {
-        deviceNo: '', // 设备编号
+        srcDeviceCode: '', // 设备编号
         stationName: '' //  网点名称
       },
       // 表头
@@ -117,7 +117,7 @@ export default {
   methods: {
     // 重置
     handleReset () {
-      this.queryParam.deviceNo = ''
+      this.queryParam.srcDeviceCode = ''
       this.queryParam.stationName = ''
       this.$refs.table.refresh(true)
     },

+ 4 - 14
src/views/equipmentManage/network/editModal.vue

@@ -94,7 +94,6 @@
               rules: [{ required: true, message: '请选择兑换规则' }] },
           ]"
           placeholder="请选择兑换规则"
-          @change="goldExRuleNoChange"
         >
           <a-select-option v-for="(item,index) in goldExRuleNoList" :key="index" :value="item.goldExRuleNo">
             {{ item.name }}
@@ -111,7 +110,6 @@
               rules: [{ required: true, message: '请选择投递时间段' }] },
           ]"
           placeholder="请选择投递时间段"
-          @change="deliveryTimeRuleNoChange"
         >
           <a-select-option v-for="(item,index) in deliveryTimeRuleNoList" :key="index" :value="item.deliveryTimeRuleNo">
             {{ item.name }}
@@ -161,8 +159,6 @@ export default {
         lon: '', //  经度
         goldExRuleNo: undefined, //  兑换规则
         deliveryTimeRuleNo: undefined //  投递时间段
-        // goldExRuleNo: 'sss', //  兑换规则
-        // deliveryTimeRuleNo: 'ddd' //  投递时间段
       },
       options: addrData, //  省市区下拉数据
       areas: [], //  省市区 值
@@ -196,7 +192,6 @@ export default {
       e.preventDefault()
       const _this = this
       this.form.validateFields((err, values) => {
-        console.log(err, values, '-上传')
         if (!err) {
           if (values.options.length) {
             values.formData.provinceCode = values.options[0]
@@ -220,27 +215,23 @@ export default {
         }
       })
     },
-    //  投递时间段  change
-    deliveryTimeRuleNoChange (val) {
-
-    },
-    //  兑换规则  change
-    goldExRuleNoChange (val) {},
     //  投递时间段
     getdeliveryTimeRule () {
       deliveryTimeListQuery({}).then(res => {
-        console.log(res)
         if (res.status == 200) {
           this.deliveryTimeRuleNoList = res.data
+        } else {
+          this.deliveryTimeRuleNoList = []
         }
       })
     },
     //  兑换规则
     getgoldExRule () {
       goldExListQuery({}).then(res => {
-        console.log(res)
         if (res.status == 200) {
           this.goldExRuleNoList = res.data
+        } else {
+          this.goldExRuleNoList = []
         }
       })
     }
@@ -262,7 +253,6 @@ export default {
       }
     },
     networkId (newValue, oldValue) {
-      console.log(newValue, '-----newValue')
       if (this.isShow && newValue) {
         this.getDetails()
       }

+ 42 - 8
src/views/shop/GoodsLogistics.vue

@@ -15,14 +15,20 @@
       v-bind="formItemLayout"
       @submit="handleSubmit">
       <a-form-item label="快递公司" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
-        <v-select
-          ref="company"
-          code="ADVERT_POSITION"
-          allowClear
+        <a-select
           id="logistics-company"
+          allowClear
+          v-decorator="[
+            'formData.company',
+            { initialValue: formData.company,
+              rules: [{ required: true, message: '请选择快递公司' }] },
+          ]"
           placeholder="请选择快递公司"
-          v-decorator="['formData.company', { initialValue: formData.company, rules: [{ required: true, message: '请选择快递公司' }] }]"
-        ></v-select>
+        >
+          <a-select-option v-for="(item,index) in expressCompany" :key="index" :value="item.deliveryTimeRuleNo">
+            {{ item.name }}
+          </a-select-option>
+        </a-select>
       </a-form-item>
       <a-form-item label="运单编号" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
         <a-input
@@ -45,6 +51,7 @@
 
 <script>
 import { VSelect } from '@/components'
+import { expressCompanyQuery } from '@/api/order'
 export default {
   name: 'GoodsLogistics',
   components: { VSelect },
@@ -52,6 +59,10 @@ export default {
     openModal: { //  弹框显示状态
       type: Boolean,
       default: false
+    },
+    orderNo: {
+      type: [Number, String],
+      default: ''
     }
   },
   data () {
@@ -65,7 +76,8 @@ export default {
         company: null, //  快递公司
         orderNo: '' //  运单编号
       },
-      isShow: this.openModal //  是否填写物流信息
+      isShow: this.openModal, //  是否填写物流信息
+      expressCompany: [] //  快递公司
     }
   },
   methods: {
@@ -75,7 +87,24 @@ export default {
       const _this = this
       this.form.validateFields((err, values) => {
         if (!err) {
-          this.$emit('success')
+          const formData = values.formData
+          // expressCompanyQuery(formData).then(res => {
+          //   if (res.status == 200) {
+          //     _this.$message.success(res.message)
+          //     this.$emit('success')
+          //     this.isShow = false
+          //   }
+          // })
+        }
+      })
+    },
+    //  获取快递公司
+    getExpressCompany () {
+      expressCompanyQuery({}).then(res => {
+        if (res.status == 200) {
+          this.expressCompany = res.data
+        } else {
+          this.expressCompany = []
         }
       })
     }
@@ -90,6 +119,11 @@ export default {
       if (!val) {
         this.$emit('close')
       }
+    },
+    orderNo (newValue, oldValue) {
+      if (this.isShow && newValue) {
+        this.getExpressCompany()
+      }
     }
   }
 }

+ 28 - 12
src/views/shop/GoodsOrder.vue

@@ -1,29 +1,30 @@
 <template>
   <div class="goods-order-cont">
     <!-- 标题 -->
-    <div class="goods-order-header" v-if="orderData.orderStatus">
+    <div class="goods-order-header">
       <!-- 待发货 -->
-      <div class="unDelivered" v-if="orderData.orderStatus == 1">
+      <div class="unDelivered" v-if="type == 'orderGoods'">
         <p class="order-status">待发货</p>
         <a-button id="goodsOrder-send" type="primary" size="small" @click="sendGoods">立即发货</a-button>
       </div>
       <!-- 已发货 -->
-      <div class="delivered" v-if="orderData.orderStatus == 2">
-        <p class="companyInfo">快递公司:<span>{{ orderData.companyName }}</span></p>
+      <div class="delivered" v-if="type == 'express'">
+        <p class="companyInfo">快递公司:<span>{{ orderData.expressName }}</span></p>
         <div class="orderNoInfo">
-          <p class="orderNo">运单编号:<span>{{ orderData.orderNo }}</span></p>
-          <a-button id="goodsOrder-copy" size="small" v-clipboard:copy="orderData.orderNo" v-clipboard:success="onCopy">复制</a-button>
+          <p class="orderNo">运单编号:<span>{{ orderData.expressNum }}</span></p>
+          <a-button id="goodsOrder-copy" size="small" v-clipboard:copy="orderData.expressNum" v-clipboard:success="onCopy">复制</a-button>
         </div>
       </div>
     </div>
     <!-- 表格 -->
     <a-table
+      v-if="dataSource.length>0"
       ref="table"
       size="default"
-      :row-selection="orderData.orderStatus == 1 ? { selectedRowKeys: selectedRowKeys, onChange: onSelectChange } : null"
+      :row-selection="type=='orderGoods' ? { selectedRowKeys: selectedRowKeys, onChange: onSelectChange } : null"
       :columns="columns"
       :rowKey="(record) => record.id"
-      :data-source="orderData.listData || []"
+      :data-source="dataSource"
       :pagination="false"
       bordered>
     </a-table>
@@ -39,15 +40,31 @@ export default {
       default: () => {
         return {}
       }
+    },
+    type: {
+      type: String,
+      default: ''
+    }
+  },
+  computed: {
+    dataSource: function () {
+      console.log(this.orderData, '-----this.orderData')
+      if (this.type == 'orderGoods') {
+        return this.orderData
+      } else if (this.type == 'express') {
+        return this.orderData.orderGoodsList
+      } else {
+        return []
+      }
     }
   },
   data () {
     return {
       selectedRowKeys: [], //  已选项
       columns: [
-        { title: '商品名称', dataIndex: 'name', width: 200, align: 'center' },
-        { title: '商品价格', dataIndex: 'price', width: 200, align: 'center' },
-        { title: '购买数量', dataIndex: 'buyNum', width: 200, align: 'center' }
+        { title: '商品名称', dataIndex: 'goodsName', width: 200, align: 'center' },
+        { title: '商品价格', dataIndex: 'payGold', width: 200, align: 'center' },
+        { title: '购买数量', dataIndex: 'buyQty', width: 200, align: 'center' }
       ]
     }
   },
@@ -67,7 +84,6 @@ export default {
     },
     //  复制成功
     onCopy (e) {
-      console.log(e)
       this.$message.success('复制成功')
     }
   }

+ 0 - 3
src/views/shop/goodsEdit.vue

@@ -205,9 +205,7 @@ export default {
     handleSubmit (e) {
       e.preventDefault()
       const _this = this
-      console.log(this.formData, '----表单上传')
       this.form.validateFields((err, values) => {
-        console.log(err, values, '-上传')
         if (!err) {
           const formData = values.formData
           formData.desc = _this.formData.desc
@@ -244,7 +242,6 @@ export default {
     next(vm => {
       vm.getGoodsType()
       vm.getPartnerQueryList()
-      console.log(vm.$route, vm.isEdit)
       if (vm.isEdit) { //  详情页
         vm.getGoodsDetail()
       }

+ 58 - 53
src/views/shop/orderDetail.vue

@@ -4,41 +4,41 @@
       <!-- 标题 -->
       <div class="page-header">
         <h3>订单信息</h3>
-        <a-badge count="部分发货" :number-style="{ border: '1px solid #ff9900', backgroundColor: 'transparent', color: '#ff9900', padding: '1px 10px', height: '24px' }" />
+        <a-badge v-if="orderDetail" :count="orderDetail.orderStateDictValue" :number-style="{ border: '1px solid #ff9900', backgroundColor: 'transparent', color: '#ff9900', padding: '1px 10px', height: '24px' }" />
       </div>
       <a-divider />
-      <a-row :gutter="48">
+      <a-row :gutter="48" v-if="orderDetail">
         <a-col :span="8" class="item-cont">
           <p class="item-label">下单时间:</p>
-          <p class="item-main">2020-10-30 16:45</p>
+          <p class="item-main">{{ orderDetail.orderTime }}</p>
         </a-col>
         <a-col :span="8" class="item-cont">
           <p class="item-label">订单编号:</p>
-          <p class="item-main">No12387612387</p>
+          <p class="item-main">{{ orderDetail.orderNo }}</p>
         </a-col>
         <a-col :span="8" class="item-cont">
           <p class="item-label">订单总额:</p>
-          <p class="item-main">1123乐豆</p>
+          <p class="item-main">{{ orderDetail.originalGold }}乐豆</p>
         </a-col>
         <a-col :span="8" class="item-cont">
           <p class="item-label">用户手机:</p>
-          <p class="item-main">15757989887</p>
+          <p class="item-main"></p>
         </a-col>
         <a-col :span="8" class="item-cont">
           <p class="item-label">收货人姓名:</p>
-          <p class="item-main">豆豆</p>
+          <p class="item-main">{{ orderDetail.receiverName }}</p>
         </a-col>
         <a-col :span="8" class="item-cont">
           <p class="item-label">收货人手机:</p>
-          <p class="item-main">15712457854</p>
+          <p class="item-main">{{ orderDetail.receiverPhone }}</p>
         </a-col>
         <a-col :span="16" class="item-cont">
           <p class="item-label">收货地址:</p>
-          <p class="item-main">陕西省西安市未央区阿克苏接电话高科技大厦</p>
+          <p class="item-main">{{ orderDetail.receiveAddress }}</p>
         </a-col>
         <a-col :span="8" class="item-cont">
           <p class="item-label">支付时间:</p>
-          <p class="item-main">2020-10-30 16:46</p>
+          <p class="item-main">{{ orderDetail.payTime ? orderDetail.payTime : '--' }}</p>
         </a-col>
       </a-row>
     </a-card>
@@ -50,76 +50,81 @@
       <a-divider />
       <div class="goods-info-cont">
         <!-- 供应商列 -->
-        <a-tabs type="card" @change="handleClick">
-          <a-tab-pane v-for="item in menuList" :key="item.id" :tab="item.name"></a-tab-pane>
+        <a-tabs type="card" @change="handleClick" v-if="orderDetail">
+          <a-tab-pane v-for="item in orderDetail.officialPartnerOrderList" :key="item.officialPartnerNo" :tab="item.officialPartner.name"></a-tab-pane>
         </a-tabs>
         <!-- 商品订单 -->
-        <GoodsOrder v-for="(item, index) in orderData" :key="index" :orderData="item" @sendGoods="sendGoods" />
+        <!-- <GoodsOrder v-for="(item, index) in orderData" :key="index" :orderData="item" @sendGoods="sendGoods" /> -->
+        <div v-if="orderData">
+          <!-- 待发货 -->
+          <GoodsOrder v-for="(item, index) in orderData.orderExpressList" :key="index" type="express" :orderData="item" @sendGoods="sendGoods" />
+          <!-- 已发货 -->
+          <GoodsOrder v-for="(item, index) in orderData.orderGoodsList" :key="index" type="orderGoods" :orderData="item" />
+        </div>
+
       </div>
     </a-card>
     <!-- 物流信息 -->
-    <GoodsLogistics :openModal="openModal" @success="sendGoodsSuccess" @close="openModal=false" />
+    <GoodsLogistics v-if="orderDetail" :openModal="openModal" :orderNo="orderDetail.orderNo" @success="handleClick" @close="openModal=false" />
   </div>
 </template>
 
 <script>
 import GoodsOrder from './GoodsOrder.vue'
 import GoodsLogistics from './GoodsLogistics.vue'
+import { orderFind, offPartnerOrderFind } from '@/api/order'
 export default {
   name: 'OrderDetail',
   components: { GoodsOrder, GoodsLogistics },
   data () {
     return {
-      menuList: [
-        { id: 1, name: '供应商1' },
-        { id: 2, name: '供应商2' },
-        { id: 3, name: '供应商3' }
-      ],
-      orderData: [
-        {
-          orderStatus: 1,
-          listData: [
-            { id: 1, name: '蓝精灵阿斯达克洗衣液', price: 52, buyNum: 30 },
-            { id: 2, name: '前往东京国际权威的沐浴露', price: 22, buyNum: 7 },
-            { id: 3, name: '三只松鼠', price: 143, buyNum: 10 }
-          ]
-        },
-        {
-          orderStatus: 2,
-          companyName: '韵达快递',
-          orderNo: '476136981238',
-          listData: [
-            { id: 1, name: '蓝精灵阿斯达克洗衣液', price: 52, buyNum: 30 },
-            { id: 2, name: '前往东京国际权威的沐浴露', price: 22, buyNum: 7 }
-          ]
-        },
-        {
-          orderStatus: 2,
-          companyName: '顺丰快递',
-          orderNo: '4665476136981238',
-          listData: [
-            { id: 1, name: '蓝精灵阿斯达克洗衣液', price: 52, buyNum: 30 },
-            { id: 2, name: '前往东京国际权威的沐浴露', price: 22, buyNum: 7 }
-          ]
-        }
-      ],
+      orderDetail: null, //  订单详情
+      orderData: null,
+      officialPartnerNo: '', //  供货商编号
       openModal: false //  是否填写物流信息
     }
   },
   methods: {
-    //  切换  供应商
-    handleClick (item) {
-      console.log(item, '---切换供应商')
+    //  供应商下的订单信息
+    handleClick (officialPartnerNo) {
+      if (officialPartnerNo) {
+        this.officialPartnerNo = officialPartnerNo
+      }
+      offPartnerOrderFind({ orderNo: this.orderDetail.orderNo, officialPartnerNo: officialPartnerNo || this.officialPartnerNo }).then(res => {
+        if (res.status == 200) {
+          this.orderData = res.data
+        } else {
+          this.orderData = null
+        }
+      })
     },
     //  立即发货
     sendGoods (idArr) {
       console.log(idArr)
       this.openModal = true
     },
-    //  物流信息填写成功
-    sendGoodsSuccess () {
-      console.log('物流信息填写成功')
+    // //  物流信息填写成功
+    // sendGoodsSuccess () {
+    //   console.log('物流信息填写成功')
+    // },
+    getOrderDetail () {
+      orderFind({ id: this.$route.params.id }).then(res => {
+        if (res.status == 200) {
+          this.orderDetail = res.data
+          if (this.orderDetail.officialPartnerOrderList && this.orderDetail.officialPartnerOrderList.length > 0) {
+            this.officialPartnerNo = this.orderDetail.officialPartnerOrderList[0].officialPartnerNo
+            this.handleClick()
+          }
+        } else {
+          this.orderDetail = null
+        }
+      })
     }
+  },
+  beforeRouteEnter (to, from, next) {
+    next(vm => {
+      vm.getOrderDetail()
+    })
   }
 }
 </script>

+ 30 - 41
src/views/shop/shopOrder.vue

@@ -27,8 +27,8 @@
           <a-col :span="6">
             <a-form-item label="订单状态" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
               <v-select
-                v-model="queryParam.orderStatus"
-                ref="orderStatus"
+                v-model="queryParam.orderState"
+                ref="orderState"
                 id="shopOrder-status"
                 code="SETTLE_STATUS_ALL"
                 placeholder="请选择订单状态"
@@ -53,13 +53,9 @@
       :columns="columns"
       :data="loadData"
       bordered>
-      <!-- 订单状态 -->
-      <template slot="orderStatus" slot-scope="text, record">
-        <span>{{ record.orderStatus==1 ? '已启用' : '已禁用' }}</span>
-      </template>
       <!-- 订单总额 -->
-      <template slot="orderPrice" slot-scope="text, record">
-        <span>{{ record.orderPrice || 0 }}乐豆</span>
+      <template slot="originalGold" slot-scope="text, record">
+        <span>{{ record.originalGold || 0 }}乐豆</span>
       </template>
       <!-- 操作 -->
       <template slot="action" slot-scope="text, record">
@@ -74,6 +70,7 @@
 import { STable, VSelect } from '@/components'
 import getDate from '@/libs/getDate.js'
 import moment from 'moment'
+import { orderList } from '@/api/order'
 export default {
   name: 'ShopOrder',
   components: { STable, VSelect },
@@ -89,42 +86,39 @@ export default {
         endDate: null, // 结束时间
         contactPhone: '', //  用户手机
         orderNo: '', //  订单编号
-        orderStatus: null // 订单状态
+        orderState: null // 订单状态
       },
       loading: false, // 导出loading
       // 表头
       columns: [
         { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
-        { title: '下单时间', dataIndex: 'orderDate', width: 200, align: 'center' },
+        { title: '下单时间', dataIndex: 'orderTime', width: 200, align: 'center' },
         { title: '用户手机', dataIndex: 'userMoblie', width: 200, align: 'center' },
         { title: '订单编号', dataIndex: 'orderNo', width: 200, align: 'center' },
-        { title: '订单状态', scopedSlots: { customRender: 'orderStatus' }, width: 200, align: 'center' },
-        { title: '订单总额', scopedSlots: { customRender: 'orderPrice' }, width: 200, align: 'center' },
+        { title: '订单状态', dataIndex: 'orderStateDictValue', width: 200, align: 'center' },
+        { title: '订单总额', scopedSlots: { customRender: 'originalGold' }, width: 200, align: 'center' },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: 150, align: 'center' }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
-        // return getTenantsList(Object.assign(parameter, this.queryParam)).then(res => {
-        //   if (res.status == 200) {
-        //     const no = (res.data.pageNo - 1) * res.data.pageSize
-        //     for (let i = 0; i < res.data.list.length; i++) {
-        //       const _item = res.data.list[i]
-        //       _item.no = no + i + 1
-        //       _item.status = _item.status + '' === '1'
-        //     }
-        //     return res.data
-        //   }
-        // })
-        return new Promise((resolve) => {
-          const data = [
-            { no: 1, orderDate: '2020-10-30 09:14', userMoblie: '15709252525', orderNo: 'NO54456798', orderStatus: '1', orderPrice: '155' },
-            { no: 2, orderDate: '2020-10-30 09:14', userMoblie: '15709252525', orderNo: 'NO54456798', orderStatus: '0', orderPrice: '155' },
-            { no: 3, orderDate: '2020-10-30 09:14', userMoblie: '15709252525', orderNo: 'NO54456798', orderStatus: '1', orderPrice: '155' },
-            { no: 4, orderDate: '2020-10-30 09:14', userMoblie: '15709252525', orderNo: 'NO54456798', orderStatus: '1', orderPrice: '155' },
-            { no: 5, orderDate: '2020-10-30 09:14', userMoblie: '15709252525', orderNo: 'NO54456798', orderStatus: '0', orderPrice: '155' },
-            { no: 6, orderDate: '2020-10-30 09:14', userMoblie: '15709252525', orderNo: 'NO54456798', orderStatus: '0', orderPrice: '155' }
-          ]
-          resolve(data)
+        const searchData = Object.assign(parameter, this.queryParam)
+        if (this.time && this.time.length) {
+          searchData.beginDate = moment(this.time[0]).format('YYYY-MM-DD')
+          searchData.endDate = moment(this.time[1]).format('YYYY-MM-DD')
+        } else {
+          searchData.beginDate = ''
+          searchData.endDate = ''
+        }
+        return orderList(searchData).then(res => {
+          if (res.status == 200) {
+            const no = (res.data.pageNo - 1) * res.data.pageSize
+            for (let i = 0; i < res.data.list.length; i++) {
+              const _item = res.data.list[i]
+              _item.no = no + i + 1
+              _item.status = _item.status + '' === '1'
+            }
+            return res.data
+          }
         })
       },
       // 将默认当天时间日期回显在时间选择框中
@@ -135,11 +129,6 @@ export default {
       dateFormat: 'YYYY-MM-DD'
     }
   },
-  beforeRouteEnter (to, from, next) {
-    next(vm => {
-      vm.handleReset()
-    })
-  },
   methods: {
     moment,
     // 不可选日期
@@ -167,7 +156,7 @@ export default {
       ]
       this.queryParam.contactPhone = ''
       this.queryParam.orderNo = ''
-      this.queryParam.orderStatus = null
+      this.queryParam.orderState = null
       this.$refs.table.refresh(true)
     },
     // 导出
@@ -177,7 +166,7 @@ export default {
         endDate: this.queryParam.endDate == null ? getDate.getToday().endtime : this.queryParam.endDate,
         contactPhone: this.queryParam.contactPhone,
         orderNo: this.queryParam.orderNo,
-        orderStatus: this.queryParam.orderStatus
+        orderState: this.queryParam.orderState
       }
       if (!params.beginDate && !params.endDate) {
         this.$message.error('请先选择需要导出的下单时间区间再进行导出!')
@@ -187,7 +176,7 @@ export default {
       if (moment(params.endDate).diff(moment(params.beginDate), 'months', true) > 3) {
         this.$message.error('单次最多只能导出3个月的数据,请缩小查询区间后再进行导出!')
       }
-      // this.loading = true
+      this.loading = true
       // exportBundle(params).then(res => {
       //   this.loading = false
       //   this.download(res)