From 1dad164ccab7f3d800fc315d5b64f47427eeed21 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Fri, 27 May 2022 15:51:58 +0800
Subject: [PATCH] bug

---
 src/saas/AppCountryAlbum/Attendance.vue           | 15 +++++++--------
 src/saas/AppCountryAlbum/WatermarkConfig.vue      |  2 ++
 src/saas/AppCountryAlbum/components/Organize.vue  | 15 +++++++--------
 .../components/report/InspectLog.vue              |  2 +-
 .../components/report/MeetingMminutes.vue         |  2 +-
 5 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/saas/AppCountryAlbum/Attendance.vue b/src/saas/AppCountryAlbum/Attendance.vue
index 7802df09..c699df22 100644
--- a/src/saas/AppCountryAlbum/Attendance.vue
+++ b/src/saas/AppCountryAlbum/Attendance.vue
@@ -9,12 +9,10 @@
             <p>日·数据统计</p>
           </div>
         </div>
-        <picker mode="date" :value="date" @change="onDateChange">
-          <div class="right">
-            <image src="./images/qiehuan.png" />
-            <span>切换日期</span>
-          </div>
-        </picker>
+        <div class="right" @click="isShow = true">
+          <image src="./images/qiehuan.png" />
+          <span>切换日期</span>
+        </div>
       </div>
     </div>
     <div class="info">
@@ -44,6 +42,7 @@
         </div>
       </div>
     </div>
+    <u-calendar v-model="isShow" mode="date" @change="onDateChange"></u-calendar>
   </div>
 </template>
 
@@ -62,6 +61,7 @@
         all: '1',
         hasIn: '',
         hasOut: '',
+        isShow: false,
         isAdmin: false
       }
     },
@@ -119,8 +119,7 @@
       },
 
       onDateChange (e) {
-        const values = e.detail.value.split('-')
-        this.date = `${values[0]}年${values[1]}月${values[2]}`
+        this.date = `${e.year}年${e.month}月${e.day}`
 
         this.$nextTick(() => {
           this.getList()
diff --git a/src/saas/AppCountryAlbum/WatermarkConfig.vue b/src/saas/AppCountryAlbum/WatermarkConfig.vue
index 1affe9ee..d7b42e45 100644
--- a/src/saas/AppCountryAlbum/WatermarkConfig.vue
+++ b/src/saas/AppCountryAlbum/WatermarkConfig.vue
@@ -39,6 +39,8 @@
   import { mapFieldLable } from './config'
 
   export default {
+    appName: '表单配置',
+
     data () {
       return {
         config: [],
diff --git a/src/saas/AppCountryAlbum/components/Organize.vue b/src/saas/AppCountryAlbum/components/Organize.vue
index a600e883..8c9489cd 100644
--- a/src/saas/AppCountryAlbum/components/Organize.vue
+++ b/src/saas/AppCountryAlbum/components/Organize.vue
@@ -9,12 +9,10 @@
             <p>日·数据统计</p>
           </div>
         </div>
-        <picker mode="date" :value="date" @change="onDateChange">
-          <div class="right">
-            <image src="../images/qiehuan.png" />
-            <span>切换日期</span>
-          </div>
-        </picker>
+        <div class="right" @click="isShow = true">
+          <image src="../images/qiehuan.png" />
+          <span>切换日期</span>
+        </div>
       </div>
     </div>
     <div class="info">
@@ -89,6 +87,7 @@
         </div>
       </div>
     </div>
+    <u-calendar v-model="isShow" mode="date" @change="onDateChange"></u-calendar>
   </div>
 </template>
 
@@ -102,6 +101,7 @@
         date: '',
         list: [],
         isMore: false,
+        isShow: false,
         attendanceCount: {}
       }
     },
@@ -166,8 +166,7 @@
       },
 
       onDateChange (e) {
-        const values = e.detail.value.split('-')
-        this.date = `${values[0]}年${values[1]}月${values[2]}`
+        this.date = `${e.year}年${e.month}月${e.day}`
 
         this.$nextTick(() => {
           this.getPhotoTotal()
diff --git a/src/saas/AppCountryAlbum/components/report/InspectLog.vue b/src/saas/AppCountryAlbum/components/report/InspectLog.vue
index e62f717f..df522e78 100644
--- a/src/saas/AppCountryAlbum/components/report/InspectLog.vue
+++ b/src/saas/AppCountryAlbum/components/report/InspectLog.vue
@@ -95,7 +95,7 @@
             this.isShowDate = date.status === '1'
             this.isShowAddress = address.status === '1'
             this.title = title.defaultValue || '巡查日志'
-            this.address = uni.getStorageSync('address').address || address.defaultValue
+            this.address = address.defaultValue || uni.getStorageSync('address').address
             this.weather = uni.getStorageSync('address').weather || ''
             this.reporter = reporter.defaultValue || ''
             this.date = date.defaultValue || this.$dayjs(new Date).format('YYYY-MM-DD')
diff --git a/src/saas/AppCountryAlbum/components/report/MeetingMminutes.vue b/src/saas/AppCountryAlbum/components/report/MeetingMminutes.vue
index 1525b096..83c62dc7 100644
--- a/src/saas/AppCountryAlbum/components/report/MeetingMminutes.vue
+++ b/src/saas/AppCountryAlbum/components/report/MeetingMminutes.vue
@@ -117,7 +117,7 @@
             this.isShowAddress = address.status === '1'
 
             this.title = title.defaultValue || ''
-            this.address = uni.getStorageSync('address').address || address.defaultValue
+            this.address = address.defaultValue || uni.getStorageSync('address').address
             this.hoster = hoster.defaultValue || ''
             this.date = date.defaultValue || this.$dayjs(new Date).format('YYYY-MM-DD')
             this.remark = remark.defaultValue || ''