订单页面优化

src/components/orderList/orderList.css

@@ -37,7 +37,7 @@
 }
 
 >>>#first-right {
-  width: 360px;
+  width: 420px;
   display: flex;
   flex-direction: row;
   justify-content: space-between;
@@ -104,7 +104,7 @@
 	font-family: Microsoft YaHei-3970(82674968);
 	font-weight: 400;
 	color: #333333;
-  width: 250px;
+  width: 300px;
 	/* margin-right: 106px; */
 }
 

src/components/orderList/orderList.vue

@@ -181,7 +181,7 @@
         this.index = val;
         this.tableData = []
         this.all_money = 0
-        this.getTableData(this.$Api.orderList, this.flag, this.index,)
+        this.getTableData(this.$Api.orderList, this.flag, this.index, this.selectOrder, this.timeValue, this.bankValue)
       },
       //选择银行
       selectBank(val){
@@ -189,17 +189,20 @@
         if(val == 'jianhang'){
           this.bankValue = 1
           this.tableData = []
-          this.getTableData(this.$Api.orderList, this.flag, 1, this.selectOrder, this.timeValue, this.bankValue)
+          this.index = 1
+          this.getTableData(this.$Api.orderList, this.flag, this.index, this.selectOrder, this.timeValue, this.bankValue)
           this.$message.success("已选择支付渠道为  建行支付")
         }else if(val == 'nongshang'){
           this.bankValue = 2
           this.tableData = []
-          this.getTableData(this.$Api.orderList, this.flag, 1, this.selectOrder, this.timeValue, this.bankValue)
+          this.index = 1
+          this.getTableData(this.$Api.orderList, this.flag, this.index, this.selectOrder, this.timeValue, this.bankValue)
           this.$message.success("已选择支付渠道为  农商行支付")
         }else{
           this.bankValue = ''
           this.tableData = []
-          this.getTableData(this.$Api.orderList, this.flag, 1, this.selectOrder, this.timeValue, this.bankValue)
+          this.index = 1
+          this.getTableData(this.$Api.orderList, this.flag, this.index, this.selectOrder, this.timeValue, this.bankValue)
           this.$message.success("已选择为所有支付")
         }
       },
@@ -219,7 +222,8 @@
           this.tableData = []
           this.all_money = 0
           this.flag = 1
-          this.getTableData(this.$Api.orderList, this.flag, 1, this.selectOrder, this.timeValue, this.bankValue)
+          this.index = 1
+          this.getTableData(this.$Api.orderList, this.flag, this.index, this.selectOrder, this.timeValue, this.bankValue)
         }
       },
       //选择月份按钮
@@ -237,25 +241,27 @@
       },
       //确定选择月份
       selectMonth(val) {
-        // console.log(this.monthValue)
+        // console.log('monthValue'+this.monthValue)
         this.formInline.value = this.monthValue
         this.editdialogFormVisible = false
         this.tableData = []
         this.all_money = 0
         this.timeValue = this.monthValue
-        this.getTableData(this.$Api.orderList, this.flag, 1, this.selectOrder, this.timeValue, this.bankValue)
+        this.index = 1
+        this.getTableData(this.$Api.orderList, this.flag, this.index, this.selectOrder, this.timeValue, this.bankValue)
         this.$message.success("月份选择成功")
         // console.log(this.flag+'   '+this.timeValue)
       },
       //确定选择日期
       selectDay() {
-        console.log(this.dayValue)
+        // console.log('dayValue'+this.dayValue)
         this.formInline.value = this.dayValue
         this.editdialogFormVisible = false
         this.tableData = []
         this.all_money = 0
         this.timeValue = this.dayValue
-        this.getTableData(this.$Api.orderList, this.flag, 1, this.selectOrder, this.timeValue, this.bankValue)
+        this.index = 1
+        this.getTableData(this.$Api.orderList, this.flag, this.index, this.selectOrder, this.timeValue, this.bankValue)
         this.$message.success("日期选择成功")
         // console.log(this.flag+'    '+this.timeValue)
       },
@@ -264,6 +270,9 @@
         this.editdialogFormVisible = false
         this.formInline.value = '请重新选择'
         this.$message.warning("请重新选择")
+        this.dayValue = ''
+        this.monthValue = ''
+        // console.log('timeValue' + this.monthValue)
       },
       //关闭对话框
       handleClose(){
@@ -276,7 +285,8 @@
         // console.log(this.selectOrder)
         this.tableData = []
         this.all_money = 0
-        this.getTableData(this.$Api.orderList, this.flag, 1, this.selectOrder, this.timeValue, this.bankValue)
+        this.index = 1
+        this.getTableData(this.$Api.orderList, this.flag, this.index, this.selectOrder, this.timeValue, this.bankValue)
         this.$message.success("查找成功")
       },
       //获取订单数据
@@ -295,7 +305,7 @@
             'admin_token': this.user_token
           }
         }).then(res => {
-          console.log(res)
+          // console.log(res)
           this.totalCount = res.data.data.page.totalCount
           for (var i = 0; i < res.data.data.page.list.length; i++) {
             var list = {}
@@ -324,6 +334,7 @@
           // console.log(this.tableData)
         }).catch(err => {
           console.log(err)
+          this.$message.error("订单导出失败")
         })
       },
       //下载文件
@@ -348,8 +359,10 @@
         }).then(res => {
           // console.log(res)
           this.download(res.data)
+          this.$message.success(this.datestr + "表格导出成功")
         }).catch(err => {
           console.log(err)
+          this.$message.error("表格导出失败")
         })
       },
       //下载