no message

src/views/mallManagement/order/order_offline_sales_sum/index.vue

@@ -66,11 +66,11 @@
           header-cell-class-name="headerRowColor"
           highlight-current-row
         >
-          <el-table-column align="center" label="收款人" prop="paidBy" min-width="140">
+          <el-table-column align="center" label="收款人" prop="paidBy" min-width="80">
           </el-table-column>
           <el-table-column align="center" :label="(!screenForm.dateType ? '当月' : '当日') + '订单数'" prop="num">
           </el-table-column>
-          <el-table-column align="center" :label="(!screenForm.dateType ? '当月' : '当日') + '收款金额'" prop="amount">
+          <el-table-column align="center" :label="(!screenForm.dateType ? '当月' : '当日') + '收款金额'" prop="amount" min-width="100">
           </el-table-column>
           <el-table-column align="center" label="销售金额">
             <el-table-column align="center" label="现金" prop="cashAmount" />
@@ -82,9 +82,9 @@
             <el-table-column align="center" label="微信" prop="wxCount" />
             <el-table-column align="center" label="转账" prop="transferCount" />
           </el-table-column>
-          <el-table-column align="center" :label="(!screenForm.dateType ? '当月' : '当日') + '退货金额'" prop="refundAmount">
+          <el-table-column align="center" :label="(!screenForm.dateType ? '当月' : '当日') + '退货金额'" prop="refundAmount" min-width="100">
           </el-table-column>
-          <el-table-column align="center" :label="(!screenForm.dateType ? '当月' : '当日') + '退货次数'" prop="refundCount">
+          <el-table-column align="center" :label="(!screenForm.dateType ? '当月' : '当日') + '退货次数'" prop="refundCount" min-width="100">
           </el-table-column>
           <el-table-column fixed="right" align="center" label="">
             <template slot-scope="scope">
@@ -153,8 +153,8 @@ export default {
         dateTime: ''
       },
       dateTypes: [
-        { value: 0, label: '月份' },
-        { value: 1, label: '日期' }
+        { value: 1, label: '日期' },
+        { value: 0, label: '月份' }
       ],
       isOpen: false, // 是否展开条件筛选
       dialogVisible: false,
@@ -186,8 +186,9 @@ export default {
     // 查询列表
     getList() {
       this.listLoading = true
-      if (!this.screenForm.month) {
-        this.$errorMsg('请选择月份!')
+      if (!this.screenForm.dateType ? !this.screenForm.month : !this.screenForm.dateTime) {
+        this.$errorMsg('请选择!')
+        this.listLoading = false
         return
       }
       const params = {

src/views/mallManagement/order/order_wait_deliver_list/index.vue

@@ -1154,7 +1154,7 @@ export default {
         phone: this.screenForm.phone, // 手机号
         websitId: this.screenForm.websitId,
         exchangeCode: this.screenForm.exchangeCode,
-        orderStatus: this.screenForm.orderStatus, // 状态
+        orderStatus: 'DFH', // 状态
         payStatus: this.screenForm.payStatus, // 状态
         startCreateTime: this.screenForm.createDate[0] ? this.screenForm.createDate[0] : null, // 创建时间
         endCreateTime: this.screenForm.createDate[1] ? this.screenForm.createDate[1] : null, // 创建时间
@@ -1167,7 +1167,8 @@ export default {
         pageNum: this.currentPage,
         pageSize: this.pageSize
       }
-      downloadFiles('order/export', screenData)
+      console.log(screenData)
+      // downloadFiles('order/export', screenData)
     },
 
     // 切换全选/全不选