From 1825ead8c86cf78eeda4b6fbbef5fba9cb5607fd Mon Sep 17 00:00:00 2001
From: jinna <jn517618@163.com>
Date: Wed, 1 Mar 2023 17:30:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=9F=E8=AE=A1=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E3=80=81=E6=94=BE=E5=8F=B7=E6=95=B0=E9=87=8F=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/booknumber/index.vue | 16 ++++++++--------
 src/views/statistics/index.vue |  8 ++++++++
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/views/booknumber/index.vue b/src/views/booknumber/index.vue
index 804fa1a..ec2be0e 100644
--- a/src/views/booknumber/index.vue
+++ b/src/views/booknumber/index.vue
@@ -622,12 +622,11 @@ export default {
       this.count = 0;
       this.tabArr.map(item => {
         item.addForm.addData.map(item1 => {
-          item1.num = item1.num ==  undefined ? 0 : item1.num
-          this.count += parseInt(item1.num)
+          this.count += parseInt(item1.num ==  undefined ? 0 : item1.num)
           })
         item.addForm.addData1.map(item1 => {
-          item1.num = item1.num ==  undefined ? 0 : item1.num
-          this.count += parseInt(item1.num)})
+          this.count += parseInt(item1.num ==  undefined ? null : item1.num)
+        })
       })
       if (this.userInfo.role_name !== "hospital") {
         if (this.deptName == '') {
@@ -655,16 +654,17 @@ export default {
       pmTimeValite = pmArr.find(item => item < '12:00')
       if (tmp == undefined && tmp1 == undefined) {
         this.$message.error('请至少添加一条数据');
-        done()
+        // done()
       } else if (this.count == 0) {
         this.$message.error('号源数量不可为0');
-        done()
+        console.log(this.tabArr)
+        // done()
       } else if (amTimeValite) {
         this.$message.error('预约上午时段不可选择下午时间');
-        done()
+        // done()
       } else if (pmTimeValite) {
         this.$message.error('预约下午时段不可选择上午时间');
-        done()
+        // done()
       }
       else {
         if (this.isEdit) {
diff --git a/src/views/statistics/index.vue b/src/views/statistics/index.vue
index 61b0613..c6e7b78 100644
--- a/src/views/statistics/index.vue
+++ b/src/views/statistics/index.vue
@@ -204,6 +204,14 @@ export default {
   methods: {
     exportAll(){
         console.log(this.query)
+        if(this.query.releaseTime){
+            this.query.startTime = this.query.releaseTime[0];
+            this.query.endTime = this.query.releaseTime[1]
+        }else{
+            this.query.startTime = '';
+            this.query.endTime = ''
+        }
+       
         exportList(this.query).then(res =>{
             console.log(res)
             if (!res || !res.data) {