From 422bd341efa00d51f433099d7e981d1455f733ff Mon Sep 17 00:00:00 2001
From: ryoeiken <754264374@qq.com>
Date: Wed, 23 Dec 2020 08:17:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E6=97=A5=E5=B8=B8?=
 =?UTF-8?q?=E6=94=B6=E8=B4=B9=20-=20=E6=94=B6=E8=B4=B9=20=E6=B8=85?=
 =?UTF-8?q?=E7=A9=BA=E9=80=89=E6=8B=A9=E6=97=A5=E6=9C=9F=E6=97=B6=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/views/fantang/settle/index.vue | 23 ++++++++++++++-------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/ruoyi-ui/src/views/fantang/settle/index.vue b/ruoyi-ui/src/views/fantang/settle/index.vue
index 65552b6f4..3a04b5be4 100644
--- a/ruoyi-ui/src/views/fantang/settle/index.vue
+++ b/ruoyi-ui/src/views/fantang/settle/index.vue
@@ -186,7 +186,7 @@
         <el-row :gutter="10">
           <el-col :span="8">
             <!--            <el-form-item label="上次结算日期" prop="lastBillingDate" v-if="lastBillFlag">-->
-            <el-form-item label="上次结算/用餐日期" prop="lastBillingDate">
+            <el-form-item label="上次结算 / 用餐日期" prop="lastBillingDate">
               <!--              <el-input v-model="formAddNewSettlement.lastBillingDate" :disabled="true"/>-->
               <el-date-picker
                 v-model="formAddNewSettlement.lastBillingDate"
@@ -457,7 +457,7 @@ export default {
 
       dateSpan = sDate2 - sDate1;
       if (dateSpan < 0) {
-        this.msgError("你现在的结算日期小于上一次结算日期！！");
+        this.msgError("你现在的结算日期小于上一次上次结算 / 用餐日期");
       } else {
 
         dateSpan = Math.abs(dateSpan);
@@ -465,12 +465,19 @@ export default {
         this.formAddNewSettlement.settlementDays = iDays;
       }
 
-      showMealsWithSelect(this.formAddNewSettlement).then(response => {
-        this.mealsList = response.data.reportMealsList;
-        this.dinnerTotalPrice = response.data.reportMealsPrice.dinnerTotalPrice;
-        this.nutritionTotalPrice = response.data.reportMealsPrice.nutritionTotalPrice;
-        this.sumTotalPrice = response.data.reportMealsPrice.sumTotalPrice;
-      })
+      if (this.formAddNewSettlement.selectBillingDate!=null){
+        showMealsWithSelect(this.formAddNewSettlement).then(response => {
+          this.mealsList = response.data.reportMealsList;
+          this.dinnerTotalPrice = response.data.reportMealsPrice.dinnerTotalPrice;
+          this.nutritionTotalPrice = response.data.reportMealsPrice.nutritionTotalPrice;
+          this.sumTotalPrice = response.data.reportMealsPrice.sumTotalPrice;
+        })
+      }else {
+        this.mealsList = null;
+        this.dinnerTotalPrice = 0;
+        this.nutritionTotalPrice = 0;
+        this.sumTotalPrice = 0;
+      }
     },
     // 获取用户相关信息
     myGetUser() {