From b989da3c3a99fef9068c20ac55467d7ce25523af Mon Sep 17 00:00:00 2001
From: su1124 <1583764726@qq.com>
Date: 星期五, 08 三月 2024 14:25:04 +0800
Subject: [PATCH] su

---
 src/views/hosp/Summary/index.vue |   37 ++++++++++++++++++++++++++++++-------
 1 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/src/views/hosp/Summary/index.vue b/src/views/hosp/Summary/index.vue
index ee35ce6..4e65302 100644
--- a/src/views/hosp/Summary/index.vue
+++ b/src/views/hosp/Summary/index.vue
@@ -61,9 +61,21 @@
 import { getlistWater, getWater, getdatalist, addTjSummary, getNewDate, getbigntime } from "@/api/hosp/water";
 import { getInfo } from "@/api/login";
 import moment from "moment";
+import {getNewDateList} from "@/api/hosp/order";
 export default {
   name: "Water",
   data() {
+    let checkPhoneNum = (rule, value, callback) => {
+         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 (!patter.test(value)) {
+        return callback('');
+      }
+    };
     return {
       value1: "",
       begTime: "",
@@ -99,13 +111,13 @@
       // 琛ㄥ崟鏍¢獙
       rules: {
         createTime: [
-          { required: true, message: "", trigger: "blur" }
+          { required: true, validator: checkPhoneNum,  trigger: "blur" }
         ],
         updateTime: [
-          { required: true, message: "", trigger: "blur" }
+          { required: true, validator: checkPhoneNum,  trigger: "blur" }
         ],
         deleted: [
-          { required: true, message: "", trigger: "blur" }
+          { required: true, validator: checkPhoneNum,  trigger: "blur" }
         ]
       }
     };
@@ -125,15 +137,26 @@
           this.queryParams.tollCollectorId = response.user.userId;
         });
       });
-      getNewDate().then((response) => {
+      // getNewDate().then((response) => {
+      //   if (response.code === 200) {
+      //     this.queryParams.accountEndTime = moment(response.data).format("YYYY-MM-DD HH:mm:ss")
+      //   }
+      // });
+      getNewDateList().then((response) => {
         if (response.code === 200) {
-          this.queryParams.accountEndTime = moment(response.data).format("YYYY-MM-DD HH:mm:ss")
+          this.queryParams.accountEndTime = moment(response.data).format("YYYY-MM-DD 23:59:00")
         }
       });
-      getbigntime().then((response) => {
+      // getbigntime().then((response) => {
+      //   if (response.code === 200) {
+      //     this.queryParams.accountBeginTime =
+      //       moment(response.data).format("YYYY-MM-DD HH:mm:ss")
+      //   }
+      // });
+      getNewDateList().then((response) => {
         if (response.code === 200) {
           this.queryParams.accountBeginTime =
-            moment(response.data).format("YYYY-MM-DD HH:mm:ss")
+            moment(response.data).format("YYYY-MM-DD 00:00:00")
         }
       });
     },

--
Gitblit v1.8.0