From 7672bba9fc11315da4c42cba74504b7fd417df0c Mon Sep 17 00:00:00 2001
From: su1124 <1583764726@qq.com>
Date: 星期五, 08 三月 2024 15:43:58 +0800
Subject: [PATCH] su

---
 src/views/system/bill/index.vue        |    1 
 src/views/system/role/index.vue        |   18 
 src/views/standard/tijiancom/index.vue |  268 +++++----
 src/views/doctor/examination/index.vue |    1 
 src/views/hosp/extension/index.vue     |    1 
 src/views/hosp/settlement/index.vue    |    1 
 src/views/mall/checklog/index.vue      |   26 
 src/views/mall/timeConfig/index.vue    |  235 ++++++--
 src/views/system/positive/index.vue    |   18 
 src/views/mall/aftersale/index.vue     |  197 +++++-
 src/views/mall/cart/index.vue          |  185 +++++-
 src/views/doctor/checkAll/index.vue    |    1 
 src/views/mall/footprint/index.vue     |  125 +++-
 src/views/system/biol/index.vue        |    1 
 src/views/standard/renshunum/index.vue |  318 ++++++----
 src/views/team/reportresults/index.vue |    1 
 src/views/doctor/bgsh/index.vue        |    1 
 src/views/system/visit/index.vue       |   14 
 src/views/team/disease/index.vue       |    1 
 src/views/mall/history/index.vue       |  124 +++-
 src/views/hosp/fuzhen/index.vue        |   14 
 src/views/system/Checkout/index.vue    |    1 
 src/views/count/disease/index.vue      |   15 
 src/views/hosp/teamAppLog/index.vue    |   18 
 src/views/hosp/order/index.vue         |    4 
 src/views/count/chart/index.vue        |   20 
 src/views/system/invoice/index.vue     |    1 
 src/views/system/circle/index.vue      |   14 
 src/views/team/reporting/index.vue     |    1 
 src/views/sampling/sampling/index.vue  |    1 
 src/views/team/teams/index.vue         |    1 
 31 files changed, 1,124 insertions(+), 503 deletions(-)

diff --git a/src/views/count/chart/index.vue b/src/views/count/chart/index.vue
index 46c585e..1fdaa72 100644
--- a/src/views/count/chart/index.vue
+++ b/src/views/count/chart/index.vue
@@ -41,6 +41,14 @@
 require("echarts/lib/component/tooltip");
 require("echarts/lib/component/legend");
 require("echarts/lib/chart/pie");
+import {
+  getNumber,
+  hasReport,
+  getPdf,
+  getOrderList,
+  getNewDateList,
+} from "@/api/hosp/order";
+import moment from "moment";
 
 export default {
   name: "chart",
@@ -85,8 +93,18 @@
     };
   },
 
-
+created() {
+    this.getdate();
+  },
   methods: {
+    getdate() {
+      getNewDateList().then((res) => {
+        this.value1 = [
+            moment(res.data).format("YYYY-MM-DD 00:00:00"),
+            moment(res.data).format("YYYY-MM-DD 23:59:00")
+          ];;
+      });
+    },
     getList() {
       this.queryParams.startDate = this.startTime[0];
       this.queryParams.endDate = this.startTime[1];
diff --git a/src/views/count/disease/index.vue b/src/views/count/disease/index.vue
index 03bf63e..d3abe73 100644
--- a/src/views/count/disease/index.vue
+++ b/src/views/count/disease/index.vue
@@ -65,6 +65,10 @@
 
 <script>
 import { illness } from "@/api/count/disease";
+import {
+  getNewDateList,
+} from "@/api/hosp/order";
+import moment from "moment";
 
 export default {
   name: "disease",
@@ -139,7 +143,18 @@
 
     };
   },
+  created() {
+    this.getdate();
+  },
   methods: {
+    getdate() {
+      getNewDateList().then((res) => {
+        this.value1 = [
+            moment(res.data).format("YYYY-MM-DD 00:00:00"),
+            moment(res.data).format("YYYY-MM-DD 23:59:00")
+          ];;
+      });
+    },
     // 鏍规嵁鐤剧梾鍚嶇О鏌ヨ鐩稿叧浜哄憳淇℃伅
 
     // 鏃堕棿
diff --git a/src/views/doctor/bgsh/index.vue b/src/views/doctor/bgsh/index.vue
index 9c93877..5d028f4 100644
--- a/src/views/doctor/bgsh/index.vue
+++ b/src/views/doctor/bgsh/index.vue
@@ -169,7 +169,6 @@
           moment(res.data).format("YYYY-MM-DD 00:00:00"),
           moment(res.data).format("YYYY-MM-DD 23:59:00"),
         ];
-        console.log(this.createTimeList, 111);
       });
     },
     // / 澶勭悊榛樿閫変腑褰撳墠鏃ユ湡
diff --git a/src/views/doctor/checkAll/index.vue b/src/views/doctor/checkAll/index.vue
index b03e552..36553b6 100644
--- a/src/views/doctor/checkAll/index.vue
+++ b/src/views/doctor/checkAll/index.vue
@@ -744,7 +744,6 @@
           moment(res.data).format("YYYY-MM-DD 00:00:00"),
           moment(res.data).format("YYYY-MM-DD 23:59:00"),
         ];
-        console.log(this.createTimeList, 111);
       });
     },
     // / 澶勭悊榛樿閫変腑褰撳墠鏃ユ湡
diff --git a/src/views/doctor/examination/index.vue b/src/views/doctor/examination/index.vue
index bf16c42..155f69a 100644
--- a/src/views/doctor/examination/index.vue
+++ b/src/views/doctor/examination/index.vue
@@ -369,7 +369,6 @@
           moment(res.data).format("YYYY-MM-DD 00:00:00"),
           moment(res.data).format("YYYY-MM-DD 23:59:00"),
         ];
-        console.log(this.createTimeList, 111);
       });
     },
     // / 澶勭悊榛樿閫変腑褰撳墠鏃ユ湡
diff --git a/src/views/hosp/extension/index.vue b/src/views/hosp/extension/index.vue
index ab980b3..4690df9 100644
--- a/src/views/hosp/extension/index.vue
+++ b/src/views/hosp/extension/index.vue
@@ -425,7 +425,6 @@
           moment(res.data).format("YYYY-MM-DD 00:00:00"),
           moment(res.data).format("YYYY-MM-DD 23:59:00"),
         ];
-        console.log(this.createTimeList, 111);
       });
     },
     dialogVisibles() {
diff --git a/src/views/hosp/fuzhen/index.vue b/src/views/hosp/fuzhen/index.vue
index 42ca925..7ed034c 100644
--- a/src/views/hosp/fuzhen/index.vue
+++ b/src/views/hosp/fuzhen/index.vue
@@ -238,8 +238,9 @@
   getNumber,
   hasReport,
   getPdf,
-  getsendEmail, getsendMessage
+  getsendEmail, getsendMessage, getNewDateList
 } from "@/api/hosp/order";
+import moment from "moment";
 import {
   listSendTemplate,
 } from "@/api/hosp/sendTemplate";
@@ -381,10 +382,11 @@
     };
   },
   created() {
-    this.getNowTime();
+    // this.getNowTime();
     this.getList();
     this.getListEmer();
     this.getDictListEmer();
+    this.getdate();
   },
   mounted() {
     this.$nextTick(() => {
@@ -392,6 +394,14 @@
     });
   },
   methods: {
+    getdate() {
+      getNewDateList().then((res) => {
+        this.createTimeList = [
+            moment(res.data).format("YYYY-MM-DD 00:00:00"),
+            moment(res.data).format("YYYY-MM-DD 23:59:00")
+          ];;
+      });
+    },
     dialogVisibles() {
       this.$message.error("璇疯繛鎺ユ嫧鍙峰櫒锛�");
     },
diff --git a/src/views/hosp/order/index.vue b/src/views/hosp/order/index.vue
index dd7cedb..5b5c5c9 100644
--- a/src/views/hosp/order/index.vue
+++ b/src/views/hosp/order/index.vue
@@ -754,11 +754,8 @@
 
 <script>
 import {
-  listOrder,
   getNumber,
-  hasReportEnd,
   hasReport,
-  gettoPdf,
   getPdf,
   getOrderList,
   getNewDateList,
@@ -906,7 +903,6 @@
             moment(res.data).format("YYYY-MM-DD 00:00:00"),
             moment(res.data).format("YYYY-MM-DD 23:59:00")
           ];;
-        console.log(this.createTimeList,111);
       });
     },
     filterNode(value, data) {
diff --git a/src/views/hosp/settlement/index.vue b/src/views/hosp/settlement/index.vue
index 2e05485..98f6372 100644
--- a/src/views/hosp/settlement/index.vue
+++ b/src/views/hosp/settlement/index.vue
@@ -147,7 +147,6 @@
     // 鏃堕棿
     dateChangebirthday1(val) {
       this.value1 = val;
-      console.log(this.value1)
     },
 
     /** 缁熻 */
diff --git a/src/views/hosp/teamAppLog/index.vue b/src/views/hosp/teamAppLog/index.vue
index 0de9d3c..be5fcb7 100644
--- a/src/views/hosp/teamAppLog/index.vue
+++ b/src/views/hosp/teamAppLog/index.vue
@@ -49,8 +49,9 @@
       <el-form-item label="棰勭害鏃堕棿">
         <el-date-picker
           v-model="daterangeTjTime"
-          style="width: 240px"
-          value-format="yyyy-MM-dd"
+          :default-time="['00:00:00', '23:59:00']"
+          format="yyyy-MM-dd HH:mm"
+          value-format="yyyy-MM-dd HH:mm"
           type="daterange"
           range-separator="-"
           start-placeholder="寮�濮嬫棩鏈�"
@@ -362,6 +363,10 @@
 
 <script>
 import {
+  getNewDateList,
+} from "@/api/hosp/order";
+import moment from "moment";
+import {
   listTeamAppLog,
   getTeamAppLog,
   goutongList,
@@ -463,10 +468,19 @@
   },
   created() {
     this.getList();
+    this.getdate();
 
     // this.username = this.form.contactUserId;
   },
   methods: {
+    getdate() {
+      getNewDateList().then((res) => {
+        this.daterangeTjTime = [
+            moment(res.data).format("YYYY-MM-DD 00:00:00"),
+            moment(res.data).format("YYYY-MM-DD 23:59:00")
+          ];;
+      });
+    },
     /** 鏌ヨ灏忕▼搴忓洟闃熼绾﹁褰曞垪琛� */
     getList() {
       this.loading = true;
diff --git a/src/views/mall/aftersale/index.vue b/src/views/mall/aftersale/index.vue
index cf6081a..0fb9676 100644
--- a/src/views/mall/aftersale/index.vue
+++ b/src/views/mall/aftersale/index.vue
@@ -1,25 +1,65 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="68px"
+    >
       <el-form-item label="鍞悗缂栧彿" prop="aftersaleSn">
-        <el-input v-model="queryParams.aftersaleSn" placeholder="璇疯緭鍏ュ敭鍚庣紪鍙�" clearable @keyup.enter.native="handleQuery" style="width: 180px"/>
+        <el-input
+          v-model="queryParams.aftersaleSn"
+          placeholder="璇疯緭鍏ュ敭鍚庣紪鍙�"
+          clearable
+          @keyup.enter.native="handleQuery"
+          style="width: 180px"
+        />
       </el-form-item>
       <el-form-item label="璁㈠崟缂栧彿" prop="orderId">
-        <el-input v-model="queryParams.orderId" placeholder="璇疯緭鍏ヨ鍗曠紪鍙�" clearable @keyup.enter.native="handleQuery" style="width: 160px"/>
+        <el-input
+          v-model="queryParams.orderId"
+          placeholder="璇疯緭鍏ヨ鍗曠紪鍙�"
+          clearable
+          @keyup.enter.native="handleQuery"
+          style="width: 160px"
+        />
       </el-form-item>
       <el-form-item label="鐢ㄦ埛濮撳悕" prop="cusName">
-        <el-input v-model="queryParams.cusName" placeholder="璇疯緭鍏ョ敤鎴峰鍚�" clearable @keyup.enter.native="handleQuery" style="width: 148px"/>
+        <el-input
+          v-model="queryParams.cusName"
+          placeholder="璇疯緭鍏ョ敤鎴峰鍚�"
+          clearable
+          @keyup.enter.native="handleQuery"
+          style="width: 148px"
+        />
       </el-form-item>
       <!-- <el-form-item label="閫�娆惧師鍥�" prop="reason">
         <el-input v-model="queryParams.reason" placeholder="璇疯緭鍏ラ��娆惧師鍥�" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>-->
       <el-form-item label="鑱旂郴鐢佃瘽" prop="mobile">
-        <el-input v-model="queryParams.mobile" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" clearable @keyup.enter.native="handleQuery"  style="width: 148px"/>
-      </el-form-item> 
+        <el-input
+          v-model="queryParams.mobile"
+          placeholder="璇疯緭鍏ヨ仈绯荤數璇�"
+          clearable
+          @keyup.enter.native="handleQuery"
+          style="width: 148px"
+        />
+      </el-form-item>
       <el-form-item label="鍞悗鏃堕棿" prop="createTimeList">
-        <el-date-picker v-model="createTimeList" type="datetimerange" align="right" :picker-options="pickerOptions"
-          style="width: 260px" start-placeholder="寮�濮嬫棩鏈�" end-placeholder="缁撴潫鏃ユ湡" format="yyyy-MM-dd"
-          value-format="yyyy-MM-dd" @change="dateChangebirthday1">
+        <el-date-picker
+          v-model="createTimeList"
+          type="datetimerange"
+          align="right"
+          :picker-options="pickerOptions"
+          start-placeholder="寮�濮嬫棩鏈�"
+          end-placeholder="缁撴潫鏃ユ湡"
+          :default-time="['00:00:00', '23:59:00']"
+          format="yyyy-MM-dd HH:mm"
+          value-format="yyyy-MM-dd HH:mm"
+          @change="dateChangebirthday1"
+        >
         </el-date-picker>
       </el-form-item>
       <!-- <el-form-item label="鎿嶄綔鏃堕棿" prop="handleTime">
@@ -28,8 +68,16 @@
         </el-date-picker>
       </el-form-item> -->
       <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>
+        <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
+        >
       </el-form-item>
     </el-form>
 
@@ -86,7 +134,12 @@
       ></right-toolbar>
     </el-row> -->
 
-    <el-table border v-loading="loading" :data="aftersaleList" @selection-change="handleSelectionChange">
+    <el-table
+      border
+      v-loading="loading"
+      :data="aftersaleList"
+      @selection-change="handleSelectionChange"
+    >
       <el-table-column type="selection" width="55" align="center" />
       <!-- <el-table-column label="ID" align="center" prop="id" /> -->
       <el-table-column label="鍞悗缂栧彿" align="center" prop="aftersaleSn" />
@@ -104,19 +157,44 @@
       <!-- <el-table-column label="閫�娆捐鏄�" align="center" prop="comment" /> -->
       <el-table-column label="鍞悗鐘舵��" align="center" prop="status">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.app_aftersale_status" :value="scope.row.status" />
+          <dict-tag
+            :options="dict.type.app_aftersale_status"
+            :value="scope.row.status"
+          />
         </template>
       </el-table-column>
-      <el-table-column label="鍞悗鏃堕棿" align="center" prop="handleTime" width="180">
+      <el-table-column
+        label="鍞悗鏃堕棿"
+        align="center"
+        prop="handleTime"
+        width="180"
+      >
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.handleTime, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
-      <el-table-column fixed="right" label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
+      <el-table-column
+        fixed="right"
+        label="鎿嶄綔"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
         <template slot-scope="scope">
-          <el-button size="small" type="success"  @click="handleUpdate(scope.row)" v-hasPermi="['mall:aftersale:edit']" v-if="scope.row.status==1">閫氳繃
+          <el-button
+            size="small"
+            type="success"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['mall:aftersale:edit']"
+            v-if="scope.row.status == 1"
+            >閫氳繃
           </el-button>
-          <el-button size="small" type="danger"  @click="handleDelete(scope.row)" v-hasPermi="['mall:aftersale:remove']" v-if="scope.row.status==1">鎷掔粷
+          <el-button
+            size="small"
+            type="danger"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['mall:aftersale:remove']"
+            v-if="scope.row.status == 1"
+            >鎷掔粷
           </el-button>
         </template>
       </el-table-column>
@@ -135,8 +213,19 @@
     </div>
 
     <!-- 娣诲姞鎴栦慨鏀瑰敭鍚庡璇濇 -->
-    <el-dialog :title="title" :visible.sync="open" width="1300px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px" :inline="true">
+    <el-dialog
+      :title="title"
+      :visible.sync="open"
+      width="1300px"
+      append-to-body
+    >
+      <el-form
+        ref="form"
+        :model="form"
+        :rules="rules"
+        label-width="80px"
+        :inline="true"
+      >
         <el-form-item label="鍞悗缂栧彿" prop="aftersaleSn">
           <el-input v-model="form.aftersaleSn" placeholder="璇疯緭鍏ュ敭鍚庣紪鍙�" />
         </el-form-item>
@@ -167,8 +256,13 @@
           />
         </el-form-item> -->
         <el-form-item label="鎿嶄綔鏃堕棿" prop="handleTime">
-          <el-date-picker clearable v-model="form.handleTime" type="date" value-format="yyyy-MM-dd"
-            placeholder="璇烽�夋嫨绠＄悊鍛樻搷浣滄椂闂�">
+          <el-date-picker
+            clearable
+            v-model="form.handleTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="璇烽�夋嫨绠＄悊鍛樻搷浣滄椂闂�"
+          >
           </el-date-picker>
         </el-form-item>
       </el-form>
@@ -190,10 +284,18 @@
   addAftersale,
   updateAftersale,
 } from "@/api/mall/aftersale";
+import {
+  getNumber,
+  hasReport,
+  getPdf,
+  getOrderList,
+  getNewDateList,
+} from "@/api/hosp/order";
+import moment from "moment";
 
 export default {
   name: "Aftersale",
-  dicts: ['app_aftersale_status', ],
+  dicts: ["app_aftersale_status"],
 
   data() {
     return {
@@ -269,12 +371,21 @@
     };
   },
   created() {
-    this.getNowTime()
+    // this.getNowTime();
     this.getList();
+    this.getdate();
   },
   methods: {
-      // / 澶勭悊榛樿閫変腑褰撳墠鏃ユ湡
-      getNowTime() {
+    getdate() {
+      getNewDateList().then((res) => {
+        this.createTimeList = [
+            moment(res.data).format("YYYY-MM-DD 00:00:00"),
+            moment(res.data).format("YYYY-MM-DD 23:59:00")
+          ];;
+      });
+    },
+    // / 澶勭悊榛樿閫変腑褰撳墠鏃ユ湡
+    getNowTime() {
       var curDate = new Date().getTime();
       var dayNum = 7 * 24 * 3600 * 1000;
       var threeDays = curDate - dayNum;
@@ -292,18 +403,12 @@
       var d = time.getDate();
       // var h = time.getHours();
       // var mm = time.getMinutes();
-      return (
-        y +
-        "-" +
-        this.add0(m) +
-        "-" +
-        this.add0(d)
-      );
+      return y + "-" + this.add0(m) + "-" + this.add0(d);
     },
     dateChangebirthday1(val) {
-      if(val == null){
-        this.createTimeList = []
-      }else{
+      if (val == null) {
+        this.createTimeList = [];
+      } else {
         this.createTimeList = val;
       }
     },
@@ -311,12 +416,12 @@
     getList() {
       this.loading = true;
       if (this.createTimeList) {
-        this.queryParams.startTime = this.createTimeList[0]
-        this.queryParams.endTime = this.createTimeList[1]
+        this.queryParams.startTime = this.createTimeList[0];
+        this.queryParams.endTime = this.createTimeList[1];
       }
       listAftersale(this.queryParams).then((response) => {
         this.aftersaleList = response.rows;
-      
+
         this.total = response.total;
         this.loading = false;
       });
@@ -379,24 +484,24 @@
         orderPrice: row.amount,
         refundAmount: row.amount,
         refundType: 1,
-      }
-      agreeToRefund(data).then(res => {
+      };
+      agreeToRefund(data).then((res) => {
         if (res.code == 200) {
           this.$modal.msgSuccess("閫�娆炬垚鍔�");
-          this.getList()
+          this.getList();
         }
-      })
+      });
     },
     handleDelete(row) {
       let data = {
         id: row.id,
-      }
-      saleRefund(data).then(res => {
+      };
+      saleRefund(data).then((res) => {
         if (res.code == 200) {
           this.$modal.msgSuccess("宸叉嫆缁�");
-          this.getList()
+          this.getList();
         }
-      })
+      });
     },
   },
 };
diff --git a/src/views/mall/cart/index.vue b/src/views/mall/cart/index.vue
index c9c896a..35d96bd 100644
--- a/src/views/mall/cart/index.vue
+++ b/src/views/mall/cart/index.vue
@@ -1,6 +1,13 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="68px"
+    >
       <!-- <el-form-item label="鐢ㄦ埛ID" prop="userId">
         <el-input
           v-model="queryParams.userId"
@@ -26,15 +33,35 @@
         />
       </el-form-item> -->
       <el-form-item label="濂楅鍚嶇О" prop="goodsName">
-        <el-input v-model="queryParams.goodsName" placeholder="璇疯緭鍏ュ椁愬悕绉�" clearable @keyup.enter.native="handleQuery" />
+        <el-input
+          v-model="queryParams.goodsName"
+          placeholder="璇疯緭鍏ュ椁愬悕绉�"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
       </el-form-item>
       <el-form-item label="鑱旂郴鐢佃瘽" prop="phone">
-        <el-input v-model="queryParams.phone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" clearable @keyup.enter.native="handleQuery" />
+        <el-input
+          v-model="queryParams.phone"
+          placeholder="璇疯緭鍏ヨ仈绯荤數璇�"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
       </el-form-item>
       <el-form-item label="鎿嶄綔鏃堕棿" prop="createTimeList">
-        <el-date-picker v-model="createTimeList" type="datetimerange" align="right" :picker-options="pickerOptions"
-          style="width: 300px" start-placeholder="寮�濮嬫棩鏈�" end-placeholder="缁撴潫鏃ユ湡" format="yyyy-MM-dd"
-          value-format="yyyy-MM-dd" @change="dateChangebirthday1">
+        <el-date-picker
+          v-model="createTimeList"
+          type="datetimerange"
+          align="right"
+          :picker-options="pickerOptions"
+          style="width: 300px"
+          start-placeholder="寮�濮嬫棩鏈�"
+          end-placeholder="缁撴潫鏃ユ湡"
+          :default-time="['00:00:00', '23:59:00']"
+          format="yyyy-MM-dd HH:mm"
+          value-format="yyyy-MM-dd HH:mm"
+          @change="dateChangebirthday1"
+        >
         </el-date-picker>
       </el-form-item>
       <!-- <el-form-item label="浠锋牸" prop="price">
@@ -78,8 +105,16 @@
         />
       </el-form-item> -->
       <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>
+        <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
+        >
       </el-form-item>
     </el-form>
 
@@ -136,17 +171,52 @@
       ></right-toolbar>
     </el-row> -->
 
-    <el-table border v-loading="loading" :data="cartList" @selection-change="handleSelectionChange">
+    <el-table
+      border
+      v-loading="loading"
+      :data="cartList"
+      @selection-change="handleSelectionChange"
+    >
       <el-table-column type="selection" width="50" align="center" />
       <el-table-column label="搴忓彿" align="center" prop="newID" width="50" />
-      <el-table-column label="鐢ㄦ埛缂栫爜" align="center" prop="userId" :show-overflow-tooltip="true" />
-      <el-table-column label="鑱旂郴鐢佃瘽" align="center" prop="phone" :show-overflow-tooltip="true" />
+      <el-table-column
+        label="鐢ㄦ埛缂栫爜"
+        align="center"
+        prop="userId"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="鑱旂郴鐢佃瘽"
+        align="center"
+        prop="phone"
+        :show-overflow-tooltip="true"
+      />
       <!-- <el-table-column label="鍟嗗搧缂栫爜" align="center" prop="goodsId" :show-overflow-tooltip="true" /> -->
       <!-- <el-table-column label="鍟嗗搧缂栧彿" align="center" prop="goodsSn" :show-overflow-tooltip="true" /> -->
-      <el-table-column label="濂楅鍚嶇О" align="center" prop="goodsName" :show-overflow-tooltip="true" />
-      <el-table-column label="濂楅椤圭洰" align="center" prop="pacProName" :show-overflow-tooltip="true" />
-      <el-table-column label="浠锋牸" align="center" prop="price" :show-overflow-tooltip="true" />
-      <el-table-column label="鏁伴噺" align="center" prop="number" :show-overflow-tooltip="true" />
+      <el-table-column
+        label="濂楅鍚嶇О"
+        align="center"
+        prop="goodsName"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="濂楅椤圭洰"
+        align="center"
+        prop="pacProName"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="浠锋牸"
+        align="center"
+        prop="price"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="鏁伴噺"
+        align="center"
+        prop="number"
+        :show-overflow-tooltip="true"
+      />
       <!-- <el-table-column
         label="鍟嗗搧瑙勬牸鍊�"
         align="center"
@@ -157,7 +227,12 @@
         align="center"
         prop="checked" :show-overflow-tooltip="true"
       /> -->
-      <el-table-column label="鎿嶄綔鏃堕棿" align="center" prop="createTime" :show-overflow-tooltip="true" />
+      <el-table-column
+        label="鎿嶄綔鏃堕棿"
+        align="center"
+        prop="createTime"
+        :show-overflow-tooltip="true"
+      />
       <!-- <el-table-column label="${comment}" align="center" prop="deptId" /> -->
       <!-- <el-table-column
         label="鎿嶄綔"
@@ -187,8 +262,13 @@
 
     <div class="pag">
       <div class="pag1">
-        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-          @pagination="getList" />
+        <pagination
+          v-show="total > 0"
+          :total="total"
+          :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize"
+          @pagination="getList"
+        />
       </div>
     </div>
 
@@ -208,7 +288,10 @@
           <el-input v-model="form.goodsName" placeholder="璇疯緭鍏ュ晢鍝佸悕绉�" />
         </el-form-item>
         <el-form-item label="鍟嗗搧璐у搧琛ㄧ殑璐у搧ID" prop="productId">
-          <el-input v-model="form.productId" placeholder="璇疯緭鍏ュ晢鍝佽揣鍝佽〃鐨勮揣鍝両D" />
+          <el-input
+            v-model="form.productId"
+            placeholder="璇疯緭鍏ュ晢鍝佽揣鍝佽〃鐨勮揣鍝両D"
+          />
         </el-form-item>
         <el-form-item label="鍟嗗搧璐у搧鐨勪环鏍�" prop="price">
           <el-input v-model="form.price" placeholder="璇疯緭鍏ュ晢鍝佽揣鍝佺殑浠锋牸" />
@@ -216,14 +299,27 @@
         <el-form-item label="鍟嗗搧璐у搧鐨勬暟閲�" prop="number">
           <el-input v-model="form.number" placeholder="璇疯緭鍏ュ晢鍝佽揣鍝佺殑鏁伴噺" />
         </el-form-item>
-        <el-form-item label="鍟嗗搧瑙勬牸鍊煎垪琛紝閲囩敤JSON鏁扮粍鏍煎紡" prop="specifications">
-          <el-input v-model="form.specifications" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" />
+        <el-form-item
+          label="鍟嗗搧瑙勬牸鍊煎垪琛紝閲囩敤JSON鏁扮粍鏍煎紡"
+          prop="specifications"
+        >
+          <el-input
+            v-model="form.specifications"
+            type="textarea"
+            placeholder="璇疯緭鍏ュ唴瀹�"
+          />
         </el-form-item>
         <el-form-item label="璐墿杞︿腑鍟嗗搧鏄惁閫夋嫨鐘舵��" prop="checked">
-          <el-input v-model="form.checked" placeholder="璇疯緭鍏ヨ喘鐗╄溅涓晢鍝佹槸鍚﹂�夋嫨鐘舵��" />
+          <el-input
+            v-model="form.checked"
+            placeholder="璇疯緭鍏ヨ喘鐗╄溅涓晢鍝佹槸鍚﹂�夋嫨鐘舵��"
+          />
         </el-form-item>
         <el-form-item label="鍟嗗搧鍥剧墖鎴栬�呭晢鍝佽揣鍝佸浘鐗�" prop="picUrl">
-          <el-input v-model="form.picUrl" placeholder="璇疯緭鍏ュ晢鍝佸浘鐗囨垨鑰呭晢鍝佽揣鍝佸浘鐗�" />
+          <el-input
+            v-model="form.picUrl"
+            placeholder="璇疯緭鍏ュ晢鍝佸浘鐗囨垨鑰呭晢鍝佽揣鍝佸浘鐗�"
+          />
         </el-form-item>
         <el-form-item label="${comment}" prop="deptId">
           <el-input v-model="form.deptId" placeholder="璇疯緭鍏�${comment}" />
@@ -245,6 +341,14 @@
   addCart,
   updateCart,
 } from "@/api/mall/cart";
+import {
+  getNumber,
+  hasReport,
+  getPdf,
+  getOrderList,
+  getNewDateList,
+} from "@/api/hosp/order";
+import moment from "moment";
 
 export default {
   name: "Cart",
@@ -316,12 +420,21 @@
     };
   },
   created() {
-    this.getNowTime()
+    // this.getNowTime();
     this.getList();
+    this.getdate();
   },
   methods: {
-      // / 澶勭悊榛樿閫変腑褰撳墠鏃ユ湡
-      getNowTime() {
+    getdate() {
+      getNewDateList().then((res) => {
+        this.createTimeList = [
+            moment(res.data).format("YYYY-MM-DD 00:00:00"),
+            moment(res.data).format("YYYY-MM-DD 23:59:00")
+          ];;
+      });
+    },
+    // / 澶勭悊榛樿閫変腑褰撳墠鏃ユ湡
+    getNowTime() {
       var curDate = new Date().getTime();
       var dayNum = 7 * 24 * 3600 * 1000;
       var threeDays = curDate - dayNum;
@@ -339,19 +452,13 @@
       var d = time.getDate();
       // var h = time.getHours();
       // var mm = time.getMinutes();
-      return (
-        y +
-        "-" +
-        this.add0(m) +
-        "-" +
-        this.add0(d) 
-      );
+      return y + "-" + this.add0(m) + "-" + this.add0(d);
     },
 
     dateChangebirthday1(val) {
-      if(val == null){
-        this.createTimeList = []
-      }else{
+      if (val == null) {
+        this.createTimeList = [];
+      } else {
         this.createTimeList = val;
       }
     },
@@ -359,8 +466,8 @@
     getList() {
       this.loading = true;
       if (this.createTimeList) {
-        this.queryParams.startTime = this.createTimeList[0]
-        this.queryParams.endTime = this.createTimeList[1]
+        this.queryParams.startTime = this.createTimeList[0];
+        this.queryParams.endTime = this.createTimeList[1];
       }
       listCart(this.queryParams).then((response) => {
         response.rows.forEach((item, index) => {
@@ -409,7 +516,7 @@
     },
     /** 閲嶇疆鎸夐挳鎿嶄綔 */
     resetQuery() {
-      this.createTimeList= [];
+      this.createTimeList = [];
       this.resetForm("queryForm");
       this.handleQuery();
     },
diff --git a/src/views/mall/checklog/index.vue b/src/views/mall/checklog/index.vue
index 3c13fd5..b048841 100644
--- a/src/views/mall/checklog/index.vue
+++ b/src/views/mall/checklog/index.vue
@@ -34,8 +34,10 @@
       </el-form-item>
       <el-form-item label="鏍搁攢鏃堕棿" prop="createTimeList">
         <el-date-picker v-model="createTimeList" type="datetimerange" align="right" :picker-options="pickerOptions"
-          style="width: 300px" start-placeholder="寮�濮嬫棩鏈�" end-placeholder="缁撴潫鏃ユ湡" format="yyyy-MM-dd"
-          value-format="yyyy-MM-dd" @change="dateChangebirthday1">
+          style="width: 300px" start-placeholder="寮�濮嬫棩鏈�" end-placeholder="缁撴潫鏃ユ湡" 
+          :default-time="['00:00:00', '23:59:00']"
+          format="yyyy-MM-dd HH:mm"
+          value-format="yyyy-MM-dd HH:mm" @change="dateChangebirthday1">
         </el-date-picker>
       </el-form-item>
       <el-form-item>
@@ -211,7 +213,14 @@
   addChecklog,
   updateChecklog,
 } from "@/api/mall/checklog";
-
+import {
+  getNumber,
+  hasReport,
+  getPdf,
+  getOrderList,
+  getNewDateList,
+} from "@/api/hosp/order";
+import moment from "moment";
 export default {
   name: "Checklog",
   data() {
@@ -323,10 +332,19 @@
     };
   },
   created() {
-    this.getNowTime()
+    // this.getNowTime()
     this.getList();
+    this.getdate();
   },
   methods: {
+    getdate() {
+      getNewDateList().then((res) => {
+        this.createTimeList = [
+            moment(res.data).format("YYYY-MM-DD 00:00:00"),
+            moment(res.data).format("YYYY-MM-DD 23:59:00")
+          ];;
+      });
+    },
     getNowTime() {
       const end = new Date();
       const start = new Date(new Date().setHours(0, 0, 0, 0));
diff --git a/src/views/mall/footprint/index.vue b/src/views/mall/footprint/index.vue
index 5063298..bd26df6 100644
--- a/src/views/mall/footprint/index.vue
+++ b/src/views/mall/footprint/index.vue
@@ -1,6 +1,13 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="68px"
+    >
       <!-- <el-form-item label="鐢ㄦ埛ID" prop="userId">
         <el-input
           v-model="queryParams.userId"
@@ -10,17 +17,40 @@
         />
       </el-form-item> -->
       <el-form-item label="濂楅鍚嶇О" prop="goodsName">
-        <el-input v-model="queryParams.goodsName" placeholder="璇疯緭鍏ユ祻瑙堝晢鍝佺紪鐮�" clearable @keyup.enter.native="handleQuery" />
+        <el-input
+          v-model="queryParams.goodsName"
+          placeholder="璇疯緭鍏ユ祻瑙堝晢鍝佺紪鐮�"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
       </el-form-item>
       <el-form-item label="娴忚鏃堕棿" prop="createTimeList">
-        <el-date-picker v-model="createTimeList" type="datetimerange" align="right" :picker-options="pickerOptions"
-          style="width: 300px" start-placeholder="寮�濮嬫棩鏈�" end-placeholder="缁撴潫鏃ユ湡" format="yyyy-MM-dd"
-          value-format="yyyy-MM-dd" @change="dateChangebirthday1">
+        <el-date-picker
+          v-model="createTimeList"
+          type="datetimerange"
+          align="right"
+          :picker-options="pickerOptions"
+          style="width: 300px"
+          start-placeholder="寮�濮嬫棩鏈�"
+          end-placeholder="缁撴潫鏃ユ湡"
+          :default-time="['00:00:00', '23:59:00']"
+          format="yyyy-MM-dd HH:mm"
+          value-format="yyyy-MM-dd HH:mm"
+          @change="dateChangebirthday1"
+        >
         </el-date-picker>
       </el-form-item>
       <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>
+        <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
+        >
       </el-form-item>
     </el-form>
 
@@ -77,12 +107,17 @@
       ></right-toolbar>
     </el-row> -->
 
-    <el-table border v-loading="loading" :data="footprintList" @selection-change="handleSelectionChange">
+    <el-table
+      border
+      v-loading="loading"
+      :data="footprintList"
+      @selection-change="handleSelectionChange"
+    >
       <el-table-column type="selection" width="50" align="center" />
       <el-table-column label="搴忓彿" width="55" align="center" prop="id" />
       <el-table-column label="鐢ㄦ埛缂栫爜" align="center" prop="userId" />
       <el-table-column label="鑱旂郴鐢佃瘽" align="center" prop="phone" />
-      
+
       <el-table-column label="濂楅鍚嶇О" align="center" prop="goodsName" />
       <el-table-column label="娴忚鏃堕棿" align="center" prop="createTime" />
       <!-- <el-table-column
@@ -113,8 +148,13 @@
 
     <div class="pag">
       <div class="pag1">
-        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-          @pagination="getList" />
+        <pagination
+          v-show="total > 0"
+          :total="total"
+          :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize"
+          @pagination="getList"
+        />
       </div>
     </div>
 
@@ -122,7 +162,10 @@
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="鐢ㄦ埛缂栫爜" prop="userId">
-          <el-input v-model="form.userId" placeholder="璇疯緭鍏ョ敤鎴疯〃鐨勭敤鎴风紪鐮�" />
+          <el-input
+            v-model="form.userId"
+            placeholder="璇疯緭鍏ョ敤鎴疯〃鐨勭敤鎴风紪鐮�"
+          />
         </el-form-item>
         <el-form-item label="濂楅鍚嶇О" prop="goodsId">
           <el-input v-model="form.goodsId" placeholder="璇疯緭鍏ュ椁愬悕绉�" />
@@ -144,19 +187,26 @@
   addFootprint,
   updateFootprint,
 } from "@/api/mall/footprint";
-
+import {
+  getNumber,
+  hasReport,
+  getPdf,
+  getOrderList,
+  getNewDateList,
+} from "@/api/hosp/order";
+import moment from "moment";
 export default {
   name: "Footprint",
   data() {
     let checkPhoneNum = (rule, value, callback) => {
-         console.log( value)
+      console.log(value);
       let patter = new RegExp(/^1\s*[3456789]\s*(\d\s*){9}$/);
       if (value == "" && value == undefined && !value) {
-        return callback('');
-      }  else if(value != undefined && value != ""){
+        return callback("");
+      } else if (value != undefined && value != "") {
         return callback();
-      }else if (!patter.test(value)) {
-        return callback('');
+      } else if (!patter.test(value)) {
+        return callback("");
       }
     };
     return {
@@ -227,28 +277,28 @@
         userId: [
           {
             required: true,
-            validator: checkPhoneNum, 
+            validator: checkPhoneNum,
             trigger: "blur",
           },
         ],
         goodsId: [
           {
             required: true,
-            validator: checkPhoneNum, 
+            validator: checkPhoneNum,
             trigger: "blur",
           },
         ],
         createTime: [
           {
             required: true,
-            validator: checkPhoneNum, 
+            validator: checkPhoneNum,
             trigger: "blur",
           },
         ],
         deleted: [
           {
             required: true,
-            validator: checkPhoneNum, 
+            validator: checkPhoneNum,
             trigger: "blur",
           },
         ],
@@ -256,10 +306,19 @@
     };
   },
   created() {
-    this.getNowTime()
+    // this.getNowTime();
     this.getList();
+    this.getdate();
   },
   methods: {
+    getdate() {
+      getNewDateList().then((res) => {
+        this.createTimeList = [
+            moment(res.data).format("YYYY-MM-DD 00:00:00"),
+            moment(res.data).format("YYYY-MM-DD 23:59:00")
+          ];;
+      });
+    },
     // / 澶勭悊榛樿閫変腑褰撳墠鏃ユ湡
     getNowTime() {
       var curDate = new Date().getTime();
@@ -279,18 +338,12 @@
       var d = time.getDate();
       // var h = time.getHours();
       // var mm = time.getMinutes();
-      return (
-        y +
-        "-" +
-        this.add0(m) +
-        "-" +
-        this.add0(d)
-      );
+      return y + "-" + this.add0(m) + "-" + this.add0(d);
     },
     dateChangebirthday1(val) {
-      if(val == null){
-        this.createTimeList = []
-      }else{
+      if (val == null) {
+        this.createTimeList = [];
+      } else {
         this.createTimeList = val;
       }
     },
@@ -298,8 +351,8 @@
     getList() {
       this.loading = true;
       if (this.createTimeList) {
-        this.queryParams.startTime = this.createTimeList[0]
-        this.queryParams.endTime = this.createTimeList[1]
+        this.queryParams.startTime = this.createTimeList[0];
+        this.queryParams.endTime = this.createTimeList[1];
       }
       listFootprint(this.queryParams).then((response) => {
         this.footprintList = response.rows;
@@ -334,7 +387,7 @@
     },
     /** 閲嶇疆鎸夐挳鎿嶄綔 */
     resetQuery() {
-      this.createTimeList= [];
+      this.createTimeList = [];
       this.resetForm("queryForm");
       this.handleQuery();
     },
diff --git a/src/views/mall/history/index.vue b/src/views/mall/history/index.vue
index 7c34eec..7afc6a7 100644
--- a/src/views/mall/history/index.vue
+++ b/src/views/mall/history/index.vue
@@ -1,21 +1,56 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="68px"
+    >
       <el-form-item label="鐢ㄦ埛缂栫爜" prop="userId">
-        <el-input v-model="queryParams.userId" placeholder="璇疯緭鍏ョ敤鎴疯〃鐨勭敤鎴风紪鐮�" clearable @keyup.enter.native="handleQuery" />
+        <el-input
+          v-model="queryParams.userId"
+          placeholder="璇疯緭鍏ョ敤鎴疯〃鐨勭敤鎴风紪鐮�"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
       </el-form-item>
       <el-form-item label="鍏抽敭瀛�" prop="keyword">
-        <el-input v-model="queryParams.keyword" placeholder="璇疯緭鍏ユ悳绱㈠叧閿瓧" clearable @keyup.enter.native="handleQuery" />
+        <el-input
+          v-model="queryParams.keyword"
+          placeholder="璇疯緭鍏ユ悳绱㈠叧閿瓧"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
       </el-form-item>
       <el-form-item label="鎼滅储鏃堕棿" prop="createTimeList">
-        <el-date-picker v-model="createTimeList" type="datetimerange" align="right" :picker-options="pickerOptions"
-          style="width: 300px" start-placeholder="寮�濮嬫棩鏈�" end-placeholder="缁撴潫鏃ユ湡" format="yyyy-MM-dd"
-          value-format="yyyy-MM-dd" @change="dateChangebirthday1">
+        <el-date-picker
+          v-model="createTimeList"
+          type="datetimerange"
+          align="right"
+          :picker-options="pickerOptions"
+          style="width: 300px"
+          start-placeholder="寮�濮嬫棩鏈�"
+          end-placeholder="缁撴潫鏃ユ湡"
+         :default-time="['00:00:00', '23:59:00']"
+          format="yyyy-MM-dd HH:mm"
+          value-format="yyyy-MM-dd HH:mm"
+          @change="dateChangebirthday1"
+        >
         </el-date-picker>
       </el-form-item>
       <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>
+        <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
+        >
       </el-form-item>
     </el-form>
 
@@ -72,7 +107,12 @@
       ></right-toolbar>
     </el-row> -->
 
-    <el-table border v-loading="loading" :data="historyList" @selection-change="handleSelectionChange">
+    <el-table
+      border
+      v-loading="loading"
+      :data="historyList"
+      @selection-change="handleSelectionChange"
+    >
       <el-table-column type="selection" width="50" align="center" />
       <el-table-column label="搴忓彿" width="55" align="center" prop="id" />
       <el-table-column label="鐢ㄦ埛缂栫爜" align="center" prop="userId" />
@@ -108,8 +148,13 @@
 
     <div class="pag">
       <div class="pag1">
-        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-          @pagination="getList" />
+        <pagination
+          v-show="total > 0"
+          :total="total"
+          :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize"
+          @pagination="getList"
+        />
       </div>
     </div>
 
@@ -139,19 +184,27 @@
   addHistory,
   updateHistory,
 } from "@/api/mall/history";
+import {
+  getNumber,
+  hasReport,
+  getPdf,
+  getOrderList,
+  getNewDateList,
+} from "@/api/hosp/order";
+import moment from "moment";
 
 export default {
   name: "History",
   data() {
     let checkPhoneNum = (rule, value, callback) => {
-         console.log( value)
+      console.log(value);
       let patter = new RegExp(/^1\s*[3456789]\s*(\d\s*){9}$/);
       if (value == "" && value == undefined && !value) {
-        return callback('');
-      }  else if(value != undefined && value != ""){
+        return callback("");
+      } else if (value != undefined && value != "") {
         return callback();
-      }else if (!patter.test(value)) {
-        return callback('');
+      } else if (!patter.test(value)) {
+        return callback("");
       }
     };
     return {
@@ -220,35 +273,35 @@
         userId: [
           {
             required: true,
-            validator: checkPhoneNum, 
+            validator: checkPhoneNum,
             trigger: "blur",
           },
         ],
         keyword: [
           {
             required: true,
-            validator: checkPhoneNum, 
+            validator: checkPhoneNum,
             trigger: "blur",
           },
         ],
         fromType: [
           {
             required: true,
-            validator: checkPhoneNum, 
+            validator: checkPhoneNum,
             trigger: "change",
           },
         ],
         createTime: [
           {
             required: true,
-            validator: checkPhoneNum, 
+            validator: checkPhoneNum,
             trigger: "blur",
           },
         ],
         deleted: [
           {
             required: true,
-            validator: checkPhoneNum, 
+            validator: checkPhoneNum,
             trigger: "blur",
           },
         ],
@@ -256,10 +309,19 @@
     };
   },
   created() {
-    this.getNowTime()
+    // this.getNowTime();
     this.getList();
+    this.getdate();
   },
   methods: {
+    getdate() {
+      getNewDateList().then((res) => {
+        this.createTimeList = [
+            moment(res.data).format("YYYY-MM-DD 00:00:00"),
+            moment(res.data).format("YYYY-MM-DD 23:59:00")
+          ];;
+      });
+    },
     // / 澶勭悊榛樿閫変腑褰撳墠鏃ユ湡
     getNowTime() {
       var curDate = new Date().getTime();
@@ -279,18 +341,12 @@
       var d = time.getDate();
       // var h = time.getHours();
       // var mm = time.getMinutes();
-      return (
-        y +
-        "-" +
-        this.add0(m) +
-        "-" +
-        this.add0(d)
-      );
+      return y + "-" + this.add0(m) + "-" + this.add0(d);
     },
     dateChangebirthday1(val) {
-      if(val == null){
-        this.createTimeList = []
-      }else{
+      if (val == null) {
+        this.createTimeList = [];
+      } else {
         this.createTimeList = val;
       }
     },
@@ -298,8 +354,8 @@
     getList() {
       this.loading = true;
       if (this.createTimeList) {
-        this.queryParams.startTime = this.createTimeList[0]
-        this.queryParams.endTime = this.createTimeList[1]
+        this.queryParams.startTime = this.createTimeList[0];
+        this.queryParams.endTime = this.createTimeList[1];
       }
       listHistory(this.queryParams).then((response) => {
         this.historyList = response.rows;
diff --git a/src/views/mall/timeConfig/index.vue b/src/views/mall/timeConfig/index.vue
index 8697616..a5247fa 100644
--- a/src/views/mall/timeConfig/index.vue
+++ b/src/views/mall/timeConfig/index.vue
@@ -1,32 +1,74 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="68px"
+    >
       <el-form-item label="棰勭害鏃ユ湡" prop="createTimeList">
-        <el-date-picker v-model="createTimeList" type="datetimerange" align="right" :picker-options="pickerOptions"
-          style="width: 300px" start-placeholder="寮�濮嬫棩鏈�" end-placeholder="缁撴潫鏃ユ湡" format="yyyy-MM-dd"
-          value-format="yyyy-MM-dd" @change="dateChangebirthday1">
+        <el-date-picker
+          v-model="createTimeList"
+          type="datetimerange"
+          align="right"
+          :picker-options="pickerOptions"
+          style="width: 300px"
+          start-placeholder="寮�濮嬫棩鏈�"
+          end-placeholder="缁撴潫鏃ユ湡"
+          :default-time="['00:00:00', '23:59:00']"
+          format="yyyy-MM-dd HH:mm"
+          value-format="yyyy-MM-dd HH:mm"
+          @change="dateChangebirthday1"
+        >
         </el-date-picker>
       </el-form-item>
       <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>
+        <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
+        >
       </el-form-item>
     </el-form>
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd"
-          v-hasPermi="['mall:timeConfig:add']">鏂板
+        <el-button
+          type="primary"
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['mall:timeConfig:add']"
+          >鏂板
         </el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
-          v-hasPermi="['mall:timeConfig:edit']">淇敼
+        <el-button
+          type="primary"
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['mall:timeConfig:edit']"
+          >淇敼
         </el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button type="primary" icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
-          v-hasPermi="['mall:timeConfig:remove']">鍒犻櫎
+        <el-button
+          type="primary"
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['mall:timeConfig:remove']"
+          >鍒犻櫎
         </el-button>
       </el-col>
       <!-- <el-col :span="1.5">
@@ -39,10 +81,18 @@
           >瀵煎嚭
         </el-button>
       </el-col> -->
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
     </el-row>
 
-    <el-table border v-loading="loading" :data="timeConfigList" @selection-change="handleSelectionChange">
+    <el-table
+      border
+      v-loading="loading"
+      :data="timeConfigList"
+      @selection-change="handleSelectionChange"
+    >
       <el-table-column type="selection" width="50" align="center" />
       <el-table-column label="搴忓彿" width="55" align="center" prop="newID" />
       <el-table-column label="鏃ユ湡" align="center" prop="time" width="180">
@@ -53,13 +103,30 @@
       <el-table-column label="鎬绘暟" align="center" prop="allNum" width="100" />
       <el-table-column label="浣欐暟" align="center" prop="nowNum" width="100" />
       <el-table-column label="澶囨敞" align="center" prop="remark" />
-      <el-table-column width="80" label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
+      <el-table-column
+        width="80"
+        label="鎿嶄綔"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
         <template slot-scope="scope">
-          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-            v-hasPermi="['mall:timeConfig:edit']" title="淇敼">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['mall:timeConfig:edit']"
+            title="淇敼"
+          >
           </el-button>
-          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-            v-hasPermi="['mall:timeConfig:remove']" title="鍒犻櫎">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['mall:timeConfig:remove']"
+            title="鍒犻櫎"
+          >
           </el-button>
         </template>
       </el-table-column>
@@ -67,14 +134,25 @@
 
     <div class="pag">
       <div class="pag1">
-        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-          @pagination="getList" />
+        <pagination
+          v-show="total > 0"
+          :total="total"
+          :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize"
+          @pagination="getList"
+        />
       </div>
     </div>
 
     <!-- 娣诲姞鎴栦慨鏀归绾︽椂闂村璇濇 -->
     <el-dialog :title="title" :visible.sync="open" width="570px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="50px" :inline="true">
+      <el-form
+        ref="form"
+        :model="form"
+        :rules="rules"
+        label-width="50px"
+        :inline="true"
+      >
         <!-- <el-form-item>
           <el-radio-group v-model="radio" @change="danxuan">
             <el-radio v-model="radio" label="3">鍗曞ぉ</el-radio>
@@ -84,29 +162,56 @@
 
         <div style="display: flex" v-show="yc">
           <el-form-item label="鏃ユ湡" prop="startTime">
-            <el-date-picker disabled clearable v-model="form.startTime" type="date" value-format="yyyy-MM-dd"
-              placeholder="璇烽�夋嫨寮�濮嬫棩鏈�">
+            <el-date-picker
+              disabled
+              clearable
+              v-model="form.startTime"
+              type="date"
+              value-format="yyyy-MM-dd"
+              placeholder="璇烽�夋嫨寮�濮嬫棩鏈�"
+            >
             </el-date-picker>
           </el-form-item>
           <span style="margin-top: 10px; margin-right: 8px">~</span>
           <el-form-item prop="endTime">
-            <el-date-picker clearable v-model="form.endTime" type="date"
-              value-format="yyyy-MM-dd" placeholder="璇烽�夋嫨缁撴潫鏃ユ湡">
+            <el-date-picker
+              clearable
+              v-model="form.endTime"
+              type="date"
+              value-format="yyyy-MM-dd"
+              placeholder="璇烽�夋嫨缁撴潫鏃ユ湡"
+            >
             </el-date-picker>
           </el-form-item>
         </div>
 
         <el-form-item label="鎬绘暟" prop="allNum">
-          <el-input v-model="form.allNum" placeholder="璇疯緭鍏ユ�绘暟" style="width: 465px" /> </el-form-item><br />
+          <el-input
+            v-model="form.allNum"
+            placeholder="璇疯緭鍏ユ�绘暟"
+            style="width: 465px"
+          /> </el-form-item
+        ><br />
         <el-form-item label="浣欐暟" prop="nowNum">
-          <el-input v-model="form.nowNum" placeholder="璇疯緭鍏ヤ綑鏁�" style="width: 465px" @input="numchange"/>
+          <el-input
+            v-model="form.nowNum"
+            placeholder="璇疯緭鍏ヤ綑鏁�"
+            style="width: 465px"
+            @input="numchange"
+          />
         </el-form-item>
         <el-form-item label="澶囨敞" prop="remark">
-          <el-input v-model="form.remark" placeholder="璇疯緭鍏ュ娉�" style="width: 465px" />
+          <el-input
+            v-model="form.remark"
+            placeholder="璇疯緭鍏ュ娉�"
+            style="width: 465px"
+          />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm" :disabled="disabled">纭� 瀹�</el-button>
+        <el-button type="primary" @click="submitForm" :disabled="disabled"
+          >纭� 瀹�</el-button
+        >
         <el-button @click="cancel">鍙� 娑�</el-button>
       </div>
     </el-dialog>
@@ -123,19 +228,26 @@
   isExist,
   returnLastTime,
 } from "@/api/mall/timeConfig";
-
+import {
+  getNumber,
+  hasReport,
+  getPdf,
+  getOrderList,
+  getNewDateList,
+} from "@/api/hosp/order";
+import moment from "moment";
 export default {
   name: "TimeConfig",
   data() {
     let checkPhoneNum = (rule, value, callback) => {
-         console.log( value)
+      console.log(value);
       let patter = new RegExp(/^1\s*[3456789]\s*(\d\s*){9}$/);
       if (value == "" && value == undefined && !value) {
-        return callback('');
-      }  else if(value != undefined && value != ""){
+        return callback("");
+      } else if (value != undefined && value != "") {
         return callback();
-      }else if (!patter.test(value)) {
-        return callback('');
+      } else if (!patter.test(value)) {
+        return callback("");
       }
     };
     return {
@@ -214,35 +326,35 @@
         startTime: [
           {
             required: true,
-            validator: checkPhoneNum, 
+            validator: checkPhoneNum,
             trigger: "blur",
           },
         ],
         endTime: [
           {
             required: true,
-            validator: checkPhoneNum, 
+            validator: checkPhoneNum,
             trigger: "blur",
           },
         ],
         allNum: [
           {
             required: true,
-            validator: checkPhoneNum, 
+            validator: checkPhoneNum,
             trigger: "blur",
           },
         ],
         nowNum: [
           {
             required: true,
-            validator: checkPhoneNum, 
+            validator: checkPhoneNum,
             trigger: "blur",
           },
         ],
         deleted: [
           {
             required: true,
-            validator: checkPhoneNum, 
+            validator: checkPhoneNum,
             trigger: "blur",
           },
         ],
@@ -250,12 +362,21 @@
     };
   },
   created() {
-    this.getNowTime();
+    // this.getNowTime();
     this.getList();
+    this.getdate();
   },
   methods: {
-       // / 澶勭悊榛樿閫変腑褰撳墠鏃ユ湡
-       getNowTime() {
+    getdate() {
+      getNewDateList().then((res) => {
+        this.createTimeList = [
+            moment(res.data).format("YYYY-MM-DD 00:00:00"),
+            moment(res.data).format("YYYY-MM-DD 23:59:00")
+          ];;
+      });
+    },
+    // / 澶勭悊榛樿閫変腑褰撳墠鏃ユ湡
+    getNowTime() {
       var curDate = new Date().getTime();
       var dayNum = 7 * 24 * 3600 * 1000;
       var threeDays = curDate - dayNum;
@@ -273,18 +394,12 @@
       var d = time.getDate();
       // var h = time.getHours();
       // var mm = time.getMinutes();
-      return (
-        y +
-        "-" +
-        this.add0(m) +
-        "-" +
-        this.add0(d)
-      );
+      return y + "-" + this.add0(m) + "-" + this.add0(d);
     },
     dateChangebirthday1(val) {
-      if(val == null){
-        this.createTimeList = []
-      }else{
+      if (val == null) {
+        this.createTimeList = [];
+      } else {
         this.createTimeList = val;
       }
     },
@@ -292,8 +407,8 @@
     getList() {
       this.loading = true;
       if (this.createTimeList) {
-        this.queryParams.startTime = this.createTimeList[0]
-        this.queryParams.endTime = this.createTimeList[1]
+        this.queryParams.startTime = this.createTimeList[0];
+        this.queryParams.endTime = this.createTimeList[1];
       }
       listTimeConfig(this.queryParams).then((response) => {
         response.rows.forEach((item, index) => {
@@ -349,7 +464,7 @@
     /** 閲嶇疆鎸夐挳鎿嶄綔 */
     resetQuery() {
       this.resetForm("queryForm");
-      this.createTimeList = []
+      this.createTimeList = [];
       this.handleQuery();
     },
     // 澶氶�夋閫変腑鏁版嵁
@@ -370,8 +485,8 @@
       this.title = "娣诲姞棰勭害鏃堕棿";
     },
 
-    numchange(){
-      if(this.form.allNum < this.form.nowNum){
+    numchange() {
+      if (this.form.allNum < this.form.nowNum) {
         this.$modal.msgError("浣欐暟涓嶅彲澶т簬鎬绘暟");
       }
     },
@@ -425,7 +540,7 @@
           this.getList();
           this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
         })
-        .catch(() => { });
+        .catch(() => {});
     },
   },
 };
diff --git a/src/views/sampling/sampling/index.vue b/src/views/sampling/sampling/index.vue
index ad3b730..4a27460 100644
--- a/src/views/sampling/sampling/index.vue
+++ b/src/views/sampling/sampling/index.vue
@@ -395,7 +395,6 @@
           moment(res.data).format("YYYY-MM-DD 00:00:00"),
           moment(res.data).format("YYYY-MM-DD 23:59:00"),
         ];
-        console.log(this.createTimeList, 111);
       });
     },
     handleSizeChange(val) {
diff --git a/src/views/standard/renshunum/index.vue b/src/views/standard/renshunum/index.vue
index 8174a66..291416b 100644
--- a/src/views/standard/renshunum/index.vue
+++ b/src/views/standard/renshunum/index.vue
@@ -1,22 +1,37 @@
 <template>
-    <div>
-        <el-form :model="queryParams" ref="tableList" :inline="true" label-width="76px" style="margin: 10px 10px">
-            <el-form-item label="浣撴鏃堕棿" prop="date">
-                <el-date-picker v-model="startTime" type="datetimerange" align="right" :picker-options="pickerOptions"
-                    style="width: 310px" start-placeholder="寮�濮嬫棩鏈�" end-placeholder="缁撴潫鏃ユ湡"
-                    :default-time="['00:00:00', '23:00:00']" format="yyyy-MM-dd HH:mm" value-format="yyyy-MM-dd HH:mm"
-                    @change="dateChangebirthday1">
-                </el-date-picker>
-            </el-form-item>
-            <el-form-item>
-                <el-button type="primary" @click="submitForm">鎼滅储</el-button>
-            </el-form-item>
-        </el-form>
+  <div>
+    <el-form
+      :model="queryParams"
+      ref="tableList"
+      :inline="true"
+      label-width="76px"
+      style="margin: 10px 10px"
+    >
+      <el-form-item label="浣撴鏃堕棿" prop="date">
+        <el-date-picker
+          v-model="startTime"
+          type="datetimerange"
+          align="right"
+          :picker-options="pickerOptions"
+          style="width: 310px"
+          start-placeholder="寮�濮嬫棩鏈�"
+          end-placeholder="缁撴潫鏃ユ湡"
+          :default-time="['00:00:00', '23:00:00']"
+          format="yyyy-MM-dd HH:mm"
+          value-format="yyyy-MM-dd HH:mm"
+          @change="dateChangebirthday1"
+        >
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="submitForm">鎼滅储</el-button>
+      </el-form-item>
+    </el-form>
 
-        <div class="data-view">
-            <div id="main"></div>
-        </div>
+    <div class="data-view">
+      <div id="main"></div>
     </div>
+  </div>
 </template>
     
         
@@ -27,143 +42,170 @@
 require("echarts/lib/component/tooltip");
 require("echarts/lib/component/legend");
 require("echarts/lib/chart/pie");
+import { getNewDateList } from "@/api/hosp/order";
+import moment from "moment";
 
 export default {
-    name: "chart",
-    data() {
-        return {
-            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]);
-                    }
-                }]
+  name: "chart",
+  data() {
+    return {
+      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]);
             },
-            value1: "",
-            DateList: [],
-            startTime: [],
-            dateAll: [],
-            queryParams: {
-                date: null,
-                beginTime: null,
-                endTime: null,
+          },
+          {
+            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]);
+            },
+          },
+        ],
+      },
+      value1: "",
+      DateList: [],
+      startTime: [],
+      dateAll: [],
+      queryParams: {
+        date: null,
+        beginTime: null,
+        endTime: null,
+      },
+    };
+  },
+  created() {
+    // this.getNowTime();
+    this.getList();
+    this.getdate();
+  },
+
+  methods: {
+    getdate() {
+      getNewDateList().then((res) => {
+        this.startTime = [
+          moment(res.data).format("YYYY-MM-DD 00:00:00"),
+          moment(res.data).format("YYYY-MM-DD 23:59:00"),
+        ];
+      });
     },
-    created() {
-        this.getNowTime();
-        this.getList();
+    getList() {
+      this.queryParams.beginTime = this.startTime[0];
+      this.queryParams.endTime = this.startTime[1];
+      getTiaoNumsByDate(this.queryParams).then((res) => {
+        let myChart = this.$echarts.init(document.getElementById("main"));
+        //浣犺繘鍏ラ〉闈㈠厛鎶婂浘琛ㄦ覆鏌撲簡  鐒跺悗鎵嶈幏鍙栫殑鏁版嵁鎶�
+        myChart.setOption({
+          color: ["#5470c6"],
+          legend: {},
+          tooltip: {},
+          xAxis: {
+            type: "category",
+            data: [
+              "浣撴浜烘暟",
+              "鐢风敓鏁伴噺",
+              "濂崇敓鏁伴噺",
+              "鏀跺叆",
+              "涓浜烘暟",
+              "鍗曚綅浣撴浜烘暟",
+            ],
+          },
+          yAxis: {
+            type: "value",
+          },
+          series: [
+            {
+              data: [
+                res.data.tijianNum,
+                res.data.boysNum,
+                res.data.girlsNum,
+                {
+                  value: res.data.moneysNum,
+                  itemStyle: {
+                    color: "#a90000",
+                  },
+                },
+                res.data.personNum,
+                res.data.tuanDuiNum,
+              ],
+              type: "bar",
+            },
+          ],
+        });
+      });
+    },
+    // 鏃堕棿
+    dateChangebirthday1(val) {
+      this.startTime = val;
     },
 
-    methods: {
-        getList() {
-            this.queryParams.beginTime = this.startTime[0];
-            this.queryParams.endTime = this.startTime[1];
-            getTiaoNumsByDate(this.queryParams).then(res => {
-                let myChart = this.$echarts.init(document.getElementById("main"));
-                //浣犺繘鍏ラ〉闈㈠厛鎶婂浘琛ㄦ覆鏌撲簡  鐒跺悗鎵嶈幏鍙栫殑鏁版嵁鎶�
-                myChart.setOption({
-                    color: ['#5470c6'],
-                    legend: {},
-                    tooltip: {},
-                    xAxis: {
-                        type: 'category',
-                        data: ['浣撴浜烘暟', '鐢风敓鏁伴噺', '濂崇敓鏁伴噺', '鏀跺叆', '涓浜烘暟', '鍗曚綅浣撴浜烘暟']
-                    },
-                    yAxis: {
-                        type: 'value'
-                    },
-                    series: [
-                        {
-                            data: [res.data.tijianNum, res.data.boysNum, res.data.girlsNum, {
-                                value: res.data.moneysNum,
-                                itemStyle: {
-                                    color: '#a90000'
-                                }
-                            }, res.data.personNum, res.data.tuanDuiNum],
-                            type: 'bar'
-                        }
-                    ]
-                });
-            })
-
-
-        },
-        // 鏃堕棿
-        dateChangebirthday1(val) {
-            this.startTime = val;
-        },
-
-        // / 澶勭悊榛樿閫変腑褰撳墠鏃ユ湡
-        getNowTime() {
-            var curDate = new Date().getTime();
-            var dayNum = 7 * 24 * 3600 * 1000;
-            var threeDays = curDate - dayNum;
-            var sDay = this.getLocalTime(threeDays);
-            var end = this.getLocalTime(curDate);
-            this.startTime = [sDay, end];
-        },
-        add0(m) {
-            return m < 10 ? "0" + m : m;
-        },
-        getLocalTime(nS) {
-            var time = new Date(nS);
-            var y = time.getFullYear();
-            var m = time.getMonth() + 1;
-            var d = time.getDate();
-            var h = time.getHours();
-            var mm = time.getMinutes();
-            return (
-                y +
-                "-" +
-                this.add0(m) +
-                "-" +
-                this.add0(d) +
-                " " +
-                this.add0(h) +
-                ":" +
-                this.add0(mm)
-            );
-        },
-
-        // 鎼滅储
-        submitForm() {
-            this.queryParams.pageNum = 1;
-            this.getList();
-        },
+    // / 澶勭悊榛樿閫変腑褰撳墠鏃ユ湡
+    getNowTime() {
+      var curDate = new Date().getTime();
+      var dayNum = 7 * 24 * 3600 * 1000;
+      var threeDays = curDate - dayNum;
+      var sDay = this.getLocalTime(threeDays);
+      var end = this.getLocalTime(curDate);
+      this.startTime = [sDay, end];
     },
+    add0(m) {
+      return m < 10 ? "0" + m : m;
+    },
+    getLocalTime(nS) {
+      var time = new Date(nS);
+      var y = time.getFullYear();
+      var m = time.getMonth() + 1;
+      var d = time.getDate();
+      var h = time.getHours();
+      var mm = time.getMinutes();
+      return (
+        y +
+        "-" +
+        this.add0(m) +
+        "-" +
+        this.add0(d) +
+        " " +
+        this.add0(h) +
+        ":" +
+        this.add0(mm)
+      );
+    },
+
+    // 鎼滅储
+    submitForm() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+  },
 };
 </script>
 <style>
 .data-view {
-    margin: 5px 15px;
-    height: 580px;
+  margin: 5px 15px;
+  height: 580px;
 }
 
 #main {
-    padding: 10px;
-    height: 580px;
-    background-color: #fff;
+  padding: 10px;
+  height: 580px;
+  background-color: #fff;
 }
 </style>
     
diff --git a/src/views/standard/tijiancom/index.vue b/src/views/standard/tijiancom/index.vue
index 8a3eac3..3e63cb7 100644
--- a/src/views/standard/tijiancom/index.vue
+++ b/src/views/standard/tijiancom/index.vue
@@ -1,21 +1,36 @@
 <template>
-    <div>
-        <el-form :model="queryParams" ref="tableList" :inline="true" label-width="76px" style="margin: 10px 10px">
-            <el-form-item label="缁熻鍖洪棿" prop="date">
-                <el-date-picker v-model="value1" type="datetimerange" align="right" start-placeholder="寮�濮嬫棩鏈�"
-                    :picker-options="pickerOptions" end-placeholder="缁撴潫鏃ユ湡" :default-time="['00:00:00', '23:00:00']"
-                    format="yyyy-MM-dd HH:mm" value-format="yyyy-MM-dd HH:mm" @change="dateChangebirthday1">
-                </el-date-picker>
-            </el-form-item>
-            <el-form-item>
-                <el-button type="primary" @click="submitForm">鎼滅储</el-button>
-            </el-form-item>
-        </el-form>
+  <div>
+    <el-form
+      :model="queryParams"
+      ref="tableList"
+      :inline="true"
+      label-width="76px"
+      style="margin: 10px 10px"
+    >
+      <el-form-item label="缁熻鍖洪棿" prop="date">
+        <el-date-picker
+          v-model="value1"
+          type="datetimerange"
+          align="right"
+          start-placeholder="寮�濮嬫棩鏈�"
+          :picker-options="pickerOptions"
+          end-placeholder="缁撴潫鏃ユ湡"
+          :default-time="['00:00:00', '23:00:00']"
+          format="yyyy-MM-dd HH:mm"
+          value-format="yyyy-MM-dd HH:mm"
+          @change="dateChangebirthday1"
+        >
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="submitForm">鎼滅储</el-button>
+      </el-form-item>
+    </el-form>
 
-        <div class="data-view">
-            <div id="main"></div>
-        </div>
+    <div class="data-view">
+      <div id="main"></div>
     </div>
+  </div>
 </template>
     
         
@@ -26,123 +41,148 @@
 require("echarts/lib/component/tooltip");
 require("echarts/lib/component/legend");
 require("echarts/lib/chart/pie");
+import { getNewDateList } from "@/api/hosp/order";
+import moment from "moment";
 
 export default {
-    name: "chart",
-    data() {
-        return {
-            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]);
-                    }
-                }]
+  name: "chart",
+  data() {
+    return {
+      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]);
             },
-            value1: "",
-            DateList: [],
-            startTime: "",
-            dateAll: [],
-            queryParams: {
-                date: null,
-                startDate: null,
-                endDate: null,
+          },
+          {
+            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]);
+            },
+          },
+        ],
+      },
+      value1: "",
+      DateList: [],
+      startTime: "",
+      dateAll: [],
+      queryParams: {
+        date: null,
+        startDate: null,
+        endDate: null,
+      },
+    };
+  },
+
+  created() {
+    this.getdate();
+  },
+  methods: {
+    getdate() {
+      getNewDateList().then((res) => {
+        this.value1 = [
+          moment(res.data).format("YYYY-MM-DD 00:00:00"),
+          moment(res.data).format("YYYY-MM-DD 23:59:00"),
+        ];
+      });
     },
-
-
-    methods: {
-        getList() {
-            this.queryParams.startDate = this.startTime[0];
-            this.queryParams.endDate = this.startTime[1];
-            let myChart = this.$echarts.init(document.getElementById("main"));
-            //浣犺繘鍏ラ〉闈㈠厛鎶婂浘琛ㄦ覆鏌撲簡  鐒跺悗鎵嶈幏鍙栫殑鏁版嵁鎶�
-            myChart.setOption({
-               
-                tooltip: {},
-                xAxis: {
-                    type: 'category',
-                    data: ['涓�鑸鏌�','澶栫','鍐呯', '鍖栭獙绉�', '妫�楠岀', '蹇冪數鍥惧','濡囩','B瓒呭','鏂扮敓鍎跨', '鍎跨绉�']
-                },
-                yAxis: {
-                    type: 'value'
-                },
-                legend: {
-                    data: ['鍓╀綑浣撴浜烘暟', '宸插畬鎴愪綋妫�浜烘暟']
-                },
-
-                series: [{
-                    name: '鍓╀綑浣撴浜烘暟',
-                    color: ['#2f4554'],
-                    data: [100, 150, 120, 90, 50, 130, 110,80,90,100],
-                    type: 'bar',
-                    label: {
-                        // show: true,
-                        position: 'right'
-                    }
-                },
-                {
-                    name: '宸插畬鎴愪綋妫�浜烘暟',
-                    color: ['#c23531'],
-                    data: [120, 130, 110, 70, 60, 110, 140,80,90,80],
-                    type: 'bar',
-                    label: {
-                        // show: true,
-                        position: 'right'
-                    }
-                }]
-
-
-            });
-
+    getList() {
+      this.queryParams.startDate = this.startTime[0];
+      this.queryParams.endDate = this.startTime[1];
+      let myChart = this.$echarts.init(document.getElementById("main"));
+      //浣犺繘鍏ラ〉闈㈠厛鎶婂浘琛ㄦ覆鏌撲簡  鐒跺悗鎵嶈幏鍙栫殑鏁版嵁鎶�
+      myChart.setOption({
+        tooltip: {},
+        xAxis: {
+          type: "category",
+          data: [
+            "涓�鑸鏌�",
+            "澶栫",
+            "鍐呯",
+            "鍖栭獙绉�",
+            "妫�楠岀",
+            "蹇冪數鍥惧",
+            "濡囩",
+            "B瓒呭",
+            "鏂扮敓鍎跨",
+            "鍎跨绉�",
+          ],
         },
-        // 鏃堕棿
-        dateChangebirthday1(val) {
-            this.startTime = val;
+        yAxis: {
+          type: "value",
+        },
+        legend: {
+          data: ["鍓╀綑浣撴浜烘暟", "宸插畬鎴愪綋妫�浜烘暟"],
         },
 
-        // 鎼滅储
-        submitForm() {
-            this.queryParams.pageNum = 1;
-            this.getList();
-        },
+        series: [
+          {
+            name: "鍓╀綑浣撴浜烘暟",
+            color: ["#2f4554"],
+            data: [100, 150, 120, 90, 50, 130, 110, 80, 90, 100],
+            type: "bar",
+            label: {
+              // show: true,
+              position: "right",
+            },
+          },
+          {
+            name: "宸插畬鎴愪綋妫�浜烘暟",
+            color: ["#c23531"],
+            data: [120, 130, 110, 70, 60, 110, 140, 80, 90, 80],
+            type: "bar",
+            label: {
+              // show: true,
+              position: "right",
+            },
+          },
+        ],
+      });
+    },
+    // 鏃堕棿
+    dateChangebirthday1(val) {
+      this.startTime = val;
     },
 
-    mounted() {
-        this.getList();
+    // 鎼滅储
+    submitForm() {
+      this.queryParams.pageNum = 1;
+      this.getList();
     },
+  },
+
+  mounted() {
+    this.getList();
+  },
 };
 </script>
 <style>
 .data-view {
-    margin: 5px 15px;
-    height: 580px;
+  margin: 5px 15px;
+  height: 580px;
 }
 
 #main {
-    padding: 10px;
-    height: 580px;
-    background-color: #fff;
+  padding: 10px;
+  height: 580px;
+  background-color: #fff;
 }
 </style>
     
diff --git a/src/views/system/Checkout/index.vue b/src/views/system/Checkout/index.vue
index 1447e37..11d0613 100644
--- a/src/views/system/Checkout/index.vue
+++ b/src/views/system/Checkout/index.vue
@@ -538,7 +538,6 @@
           moment(res.data).format("YYYY-MM-DD 00:00:00"),
           moment(res.data).format("YYYY-MM-DD 23:59:00"),
         ];
-        console.log(this.createTimeList, 111);
       });
     },
     // / 澶勭悊榛樿閫変腑褰撳墠鏃ユ湡
diff --git a/src/views/system/bill/index.vue b/src/views/system/bill/index.vue
index e8576d4..a7c2974 100644
--- a/src/views/system/bill/index.vue
+++ b/src/views/system/bill/index.vue
@@ -651,7 +651,6 @@
           moment(res.data).format("YYYY-MM-DD 00:00:00"),
           moment(res.data).format("YYYY-MM-DD 23:59:00"),
         ];
-        console.log(this.createTimeList, 111);
       });
     },
     // / 澶勭悊榛樿閫変腑褰撳墠鏃ユ湡
diff --git a/src/views/system/biol/index.vue b/src/views/system/biol/index.vue
index 1bc005d..1bed226 100644
--- a/src/views/system/biol/index.vue
+++ b/src/views/system/biol/index.vue
@@ -481,7 +481,6 @@
           moment(res.data).format("YYYY-MM-DD 00:00:00"),
           moment(res.data).format("YYYY-MM-DD 23:59:00"),
         ];
-        console.log(this.createTimeList, 111);
       });
     },
     // / 澶勭悊榛樿閫変腑褰撳墠鏃ユ湡
diff --git a/src/views/system/circle/index.vue b/src/views/system/circle/index.vue
index 84bd282..8afe0fe 100644
--- a/src/views/system/circle/index.vue
+++ b/src/views/system/circle/index.vue
@@ -234,7 +234,8 @@
 var inpArr = document.getElementsByTagName("input"),
   result = "";
 import print from "print-js";
-import { getsendEmail, getsendMessage } from "@/api/hosp/order";
+import { getsendEmail, getsendMessage, getNewDateList } from "@/api/hosp/order";
+import moment from "moment";
 import {
   listSendTemplate,
 } from "@/api/hosp/sendTemplate";
@@ -391,11 +392,12 @@
     };
   },
   created() {
-    this.getNowTime();
+    // this.getNowTime();
     this.getList();
     this.Company();
     this.getListEmer();
     this.getDictListEmer();
+    this.getdate();
   },
   mounted() {
     this.$nextTick(() => {
@@ -403,6 +405,14 @@
     });
   },
   methods: {
+    getdate() {
+      getNewDateList().then((res) => {
+        this.createTimeList = [
+            moment(res.data).format("YYYY-MM-DD 00:00:00"),
+            moment(res.data).format("YYYY-MM-DD 23:59:00")
+          ];;
+      });
+    },
     dialogVisibles() {
       this.$message.error("璇疯繛鎺ユ嫧鍙峰櫒锛�");
     },
diff --git a/src/views/system/invoice/index.vue b/src/views/system/invoice/index.vue
index 094ea03..3a925c8 100644
--- a/src/views/system/invoice/index.vue
+++ b/src/views/system/invoice/index.vue
@@ -351,7 +351,6 @@
             moment(res.data).format("YYYY-MM-DD 00:00:00"),
             moment(res.data).format("YYYY-MM-DD 23:59:00")
           ];
-        console.log(this.createTimeList,111);
       });
     },
     // / 澶勭悊榛樿閫変腑褰撳墠鏃ユ湡
diff --git a/src/views/system/positive/index.vue b/src/views/system/positive/index.vue
index 94b1e1e..7c1eb18 100644
--- a/src/views/system/positive/index.vue
+++ b/src/views/system/positive/index.vue
@@ -5,7 +5,9 @@
             <el-input v-model="queryParams.tjNumber" placeholder="璇疯緭鍏ヤ綋妫�鍙�" clearable @keyup.enter.native="handleQuery" />
           </el-form-item> -->
       <el-form-item label="鐧昏鏃堕棿" prop="createTimeList">
-        <el-date-picker clearable v-model="queryParams.createTimeList" style="width: 240px" value-format="yyyy-MM-dd"
+        <el-date-picker clearable v-model="queryParams.createTimeList"  :default-time="['00:00:00', '23:59:00']"
+          format="yyyy-MM-dd HH:mm"
+          value-format="yyyy-MM-dd HH:mm"
           type="daterange" range-separator="-" start-placeholder="寮�濮嬫棩鏈�" end-placeholder="缁撴潫鏃ユ湡"
           :picker-options="pickerOptions"></el-date-picker>
       </el-form-item>
@@ -170,11 +172,12 @@
 </template>
  
 <script>
-import { listOrder, getPdf, getTjNumber, sendEmail, getsendEmail, getsendMessage } from "@/api/hosp/order";
+import { listOrder, getPdf, getTjNumber, sendEmail, getsendEmail, getsendMessage, getNewDateList } from "@/api/hosp/order";
 import { listSendTemplate, } from "@/api/hosp/sendTemplate";
 import ViewPdf from "@/components/ViewPdf";
 import { listEmer } from "@/api/system/emer";
 import { getCompany, queryCompany } from "@/api/team/tuanti";
+import moment from "moment";
 export default {
   components: {
     ViewPdf,
@@ -323,11 +326,20 @@
     };
   },
   created() {
-    this.getNowTime();
+    // this.getNowTime();
     this.getList();
     this.getListEmer();
+    this.getdate();
   },
   methods: {
+    getdate() {
+      getNewDateList().then((res) => {
+        this.queryParams.createTimeList = [
+            moment(res.data).format("YYYY-MM-DD 00:00:00"),
+            moment(res.data).format("YYYY-MM-DD 23:59:00")
+          ];;
+      });
+    },
     dialogVisibles() {
       this.$message.error("璇疯繛鎺ユ嫧鍙峰櫒锛�");
     },
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index f43160e..499bacb 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -43,8 +43,9 @@
       <el-form-item label="鍒涘缓鏃堕棿">
         <el-date-picker
           v-model="dateRange"
-          style="width: 220px"
-          value-format="yyyy-MM-dd"
+           :default-time="['00:00:00', '23:59:00']"
+          format="yyyy-MM-dd HH:mm"
+          value-format="yyyy-MM-dd HH:mm"
           type="daterange"
           range-separator="-"
           start-placeholder="寮�濮嬫棩鏈�"
@@ -376,6 +377,10 @@
 
 <script>
 import {
+  getNewDateList,
+} from "@/api/hosp/order";
+import moment from "moment";
+import {
   listRole,
   getRole,
   delRole,
@@ -490,8 +495,17 @@
   },
   created() {
     this.getList();
+    this.getdate();
   },
   methods: {
+    getdate() {
+      getNewDateList().then((res) => {
+        this.dateRange = [
+            moment(res.data).format("YYYY-MM-DD 00:00:00"),
+            moment(res.data).format("YYYY-MM-DD 23:59:00")
+          ];;
+      });
+    },
     /** 鏌ヨ瑙掕壊鍒楄〃 */
     getList() {
       this.loading = true;
diff --git a/src/views/system/visit/index.vue b/src/views/system/visit/index.vue
index 811c8dd..3987680 100644
--- a/src/views/system/visit/index.vue
+++ b/src/views/system/visit/index.vue
@@ -258,9 +258,10 @@
   getPdf,
   getOrderList,
   printCode,
+  getNewDateList
 } from "@/api/hosp/order";
 import { getsendEmail, getsendMessage } from "@/api/hosp/order";
-
+import moment from "moment";
 import { addSurveyRecord } from "@/api/hosp/surveyRecord";
 import { getDictEmerList, listEmer } from "@/api/system/emer";
 import ViewPdf from "@/components/ViewPdf";
@@ -427,10 +428,11 @@
     },
   },
   created() {
-    this.getNowTime();
+    // this.getNowTime();
     this.getList();
     this.Company();
     this.getListEmer();
+    this.getdate();
   },
   mounted() {
     this.$nextTick(() => {
@@ -438,6 +440,14 @@
     });
   },
   methods: {
+    getdate() {
+      getNewDateList().then((res) => {
+        this.createTimeList = [
+            moment(res.data).format("YYYY-MM-DD 00:00:00"),
+            moment(res.data).format("YYYY-MM-DD 23:59:00")
+          ];;
+      });
+    },
     dialogVisibles() {
       this.$message.error("璇疯繛鎺ユ嫧鍙峰櫒锛�");
     },
diff --git a/src/views/team/disease/index.vue b/src/views/team/disease/index.vue
index 837c8db..4609cd3 100644
--- a/src/views/team/disease/index.vue
+++ b/src/views/team/disease/index.vue
@@ -343,7 +343,6 @@
             moment(res.data).format("YYYY-MM-DD 00:00:00"),
             moment(res.data).format("YYYY-MM-DD 23:59:00")
           ];;
-        console.log(this.createTimeList,111);
       });
     },
     // / 澶勭悊榛樿閫変腑褰撳墠鏃ユ湡
diff --git a/src/views/team/reporting/index.vue b/src/views/team/reporting/index.vue
index 55fb6f9..63082c5 100644
--- a/src/views/team/reporting/index.vue
+++ b/src/views/team/reporting/index.vue
@@ -320,7 +320,6 @@
           moment(res.data).format("YYYY-MM-DD 00:00:00"),
           moment(res.data).format("YYYY-MM-DD 23:59:00"),
         ];
-        console.log(this.createTimeList, 111);
       });
     },
     /** 鏌ヨ浣撴鍗曚綅淇℃伅缁存姢鍒楄〃 */
diff --git a/src/views/team/reportresults/index.vue b/src/views/team/reportresults/index.vue
index 4eb5c10..c95b2f6 100644
--- a/src/views/team/reportresults/index.vue
+++ b/src/views/team/reportresults/index.vue
@@ -420,7 +420,6 @@
           moment(res.data).format("YYYY-MM-DD 00:00:00"),
           moment(res.data).format("YYYY-MM-DD 23:59:00"),
         ];
-        console.log(this.createTimeList, 111);
       });
     },
     filterNode(value, data) {
diff --git a/src/views/team/teams/index.vue b/src/views/team/teams/index.vue
index 57b85f1..96e0446 100644
--- a/src/views/team/teams/index.vue
+++ b/src/views/team/teams/index.vue
@@ -492,7 +492,6 @@
           moment(res.data).format("YYYY-MM-DD 00:00:00"),
           moment(res.data).format("YYYY-MM-DD 23:59:00"),
         ];
-        console.log(this.createTimeList, 111);
       });
     },
     getList() {

--
Gitblit v1.8.0