修改

src/views/system/revenue/index.vue

@@ -21,12 +21,27 @@
           queryParams.nursePersonName
           }}
         </el-button>
-        <!-- <el-input
+      </el-form-item>
-          v-model="queryParams.nursePersonName"
+      <el-form-item label="选择月份" prop="monthTime">
-          placeholder="请输入护理人员名称"
+        <el-date-picker
-          clearable
+          v-model="queryParams.monthTime"
-          @keyup.enter.native="handleQuery"
+          type="month"
-        />-->
+          placeholder="选择日期"
+          @change="monthtimechange"
+        ></el-date-picker>
+      </el-form-item>
+      <el-form-item label="选择日期区间" prop="monthStartTime">
+        <el-date-picker
+          v-model="valuetime"
+          type="daterange"
+          align="right"
+          @change="monthStartEndTimechange"
+          unlink-panels
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          :picker-options="pickerOptions"
+        ></el-date-picker>
       </el-form-item>
       <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
       <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -39,6 +54,8 @@
       <el-table-column label="护理人员名称" align="center" prop="nursePersonName" />
       <el-table-column label="总订单" align="center" prop="orderCount" />
       <el-table-column label="总收益" align="center" prop="orderTotalPrice" />
+      <el-table-column label="本月订单" align="center" prop="monthOrderCount" />
+      <el-table-column label="本月订单收益" align="center" prop="monthOrderTotalPrice" />
       <el-table-column label="今日订单" align="center" prop="todayOrderCount" />
       <el-table-column label="今日订单收益" align="center" prop="todayOrderPrice" />
       <!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -60,7 +77,6 @@
         </template>
       </el-table-column>-->
     </el-table>
-
     <pagination
       v-show="total>0"
       :total="total"
@@ -68,7 +84,6 @@
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />
-
     <!-- 添加或修改护理员订单佣金收益信息对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
@@ -160,7 +175,6 @@
         @pagination="nurseStationinfo"
       />
     </el-dialog>
-
     <!-- //选择人员 -->
     <el-dialog
       title="选择护理站"
@@ -268,7 +282,10 @@ export default {
         nurseStationPersonId: null,
         appointmentOrderId: null,
         revenueAmount: null,
-        finishOrderTime: null
+        finishOrderTime: null,
+        monthTime: null,
+        monthStartTime: null, //开始时间
+        monthEndTime: null //结束时间
       },
       //护理站请求参数
       nurseStationqueryParams: {
@@ -297,7 +314,39 @@ export default {
       //人员list
       nursePersonlist: [],
       nursePersontotal: 0,
-      nursePersonid: null
+      nursePersonid: null,
+      pickerOptions: {
+        shortcuts: [
+          {
+            text: "最近一周",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+              picker.$emit("pick", [start, end]);
+            }
+          },
+          {
+            text: "最近一个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+              picker.$emit("pick", [start, end]);
+            }
+          },
+          {
+            text: "最近三个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+              picker.$emit("pick", [start, end]);
+            }
+          }
+        ]
+      },
+      valuetime: ""
     };
   },
   created() {
@@ -306,6 +355,39 @@ export default {
     this.nursePersoninfo();
   },
   methods: {
+    //选择时期区间
+    monthStartEndTimechange(e) {
+      if (!this.queryParams.monthTime) {
+        this.queryParams.monthStartTime = this.formatDate(
+          new Date(e[0]).getTime()
+        );
+        this.queryParams.monthEndTime = this.formatDate(
+          new Date(e[1]).getTime()
+        );
+      } else {
+        this.queryParams.monthStartTime = null;
+        this.queryParams.monthEndTime = null;
+        this.valuetime = "";
+      }
+    },
+    //选择时期
+    monthtimechange(e) {
+      if (!this.queryParams.monthStartTime) {
+        this.queryParams.monthTime = this.formatDate(new Date(e).getTime());
+      } else {
+        this.queryParams.monthTime = "";
+      }
+    },
+    formatDate(time, timetype) {
+      let date = new Date(time); //13位时间戳
+      //let date = new Date(parseInt(time) * 1000); //10位时间戳
+      let y = date.getFullYear();
+      let MM = date.getMonth() + 1;
+      MM = MM < 10 ? "0" + MM : MM;
+      let d = date.getDate();
+      d = d < 10 ? "0" + d : d;
+      return y + "-" + MM + "-" + d;
+    },
     /** 查询护理员订单佣金收益信息列表 */
     getList() {
       this.loading = true;
@@ -348,9 +430,13 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");
+      this.valuetime = "";
       this.queryParams = {
         pageNum: 1,
-        pageSize: 10
+        pageSize: 10,
+        monthTime: null,
+        monthStartTime: null, //开始时间
+        monthEndTime: null //结束时间
       };
       this.handleQuery();
     },