From add3eac10f96a5aaacdd466dcef7d55da5b00c4d Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Wed, 28 Sep 2022 09:35:30 +0800
Subject: [PATCH] bug

---
 .../pingchang/AppCommunityManagement/Add.vue   | 18 ++++++++++++++----
 .../AppCommunityManagement/Statistics.vue      |  2 +-
 .../pingchang/AppNucleicAcidSampling/Add.vue   |  6 ++++--
 .../AppNucleicAcidSampling/Detail.vue          |  3 +--
 4 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/src/project/pingchang/AppCommunityManagement/Add.vue b/src/project/pingchang/AppCommunityManagement/Add.vue
index 38b4f307..41f4edcf 100644
--- a/src/project/pingchang/AppCommunityManagement/Add.vue
+++ b/src/project/pingchang/AppCommunityManagement/Add.vue
@@ -149,6 +149,11 @@ export default {
   },
   methods: {
     submit(status) {
+      this.$confirm(status == 2 ? '确认解除管理该记录' : '确认保存该记录').then(() => {
+        this.confirmSubmit(status)
+      })
+    },
+    confirmSubmit(status) {
       if(this.form.homeStatus === '') {
         return this.$u.toast('请选择居家状态')
       }
@@ -181,22 +186,27 @@ export default {
           uni.navigateBack()
         }
       })
-      
-
     },
     getDetail() {
       this.$http.post(`/app/appepidemicpreventioncommunitymanagement/queryDetailById?id=${this.id}`).then((res) => {
         if (res.code == 0) {
           this.form = {...res.data}
           this.form.controllerList = []
+          var info = {}
           if(this.form.controllerUserName) {
-            var info = {
+            info = {
               name: this.form.controllerUserName,
               id: this.form.controllerUserId,
               mobile: this.form.controllerUserPhone
             }
-            this.form.controllerList.push(info)
+          }else {
+            info = {
+              name: this.user.name,
+              id: this.user.id,
+              mobile: this.user.phone
+            }
           }
+          this.form.controllerList.push(info)
           if(this.form.homeStatus === null) {
             this.form.homeStatus = ''
           }
diff --git a/src/project/pingchang/AppCommunityManagement/Statistics.vue b/src/project/pingchang/AppCommunityManagement/Statistics.vue
index c8dbf604..5075a337 100644
--- a/src/project/pingchang/AppCommunityManagement/Statistics.vue
+++ b/src/project/pingchang/AppCommunityManagement/Statistics.vue
@@ -6,7 +6,7 @@
         <div class="title">
           <div>
             <span v-if="beginDate" @click="showDateSelect=true">{{ beginDate }} 至 {{ endDate }}</span>
-            <span v-else @click="showDateSelect=true">时间选择</span>
+            <span v-else @click="showDateSelect=true">日期选择</span>
             <u-icon name="arrow-down" color="#666" size="28" style="margin-left: 4px"  v-if="!beginDate" @click="showDateSelect=true"/>
             <u-icon name="close-circle" color="#666" size="34" style="margin-left: 4px"  v-else @click="clearDate" />
           </div>
diff --git a/src/project/pingchang/AppNucleicAcidSampling/Add.vue b/src/project/pingchang/AppNucleicAcidSampling/Add.vue
index a44dd76c..04806bf7 100644
--- a/src/project/pingchang/AppNucleicAcidSampling/Add.vue
+++ b/src/project/pingchang/AppNucleicAcidSampling/Add.vue
@@ -134,10 +134,12 @@ export default {
       this.form.registerId = this.info.registerId
       this.$http.post(`/app/appepidemicpreventioncommunitymanagement/nucleicAcidSamplin`, this.form).then((res) => {
         if (res.code == 0) {
-          this.$u.toast('提交成功')
           uni.$emit('updateDetail')
           uni.$emit('updateList')
-          uni.navigateBack()
+          this.$u.toast('提交成功')
+          setTimeout(() => {
+            uni.navigateBack()
+          }, 600);
         }
       })
       
diff --git a/src/project/pingchang/AppNucleicAcidSampling/Detail.vue b/src/project/pingchang/AppNucleicAcidSampling/Detail.vue
index e215eec2..50ac1173 100644
--- a/src/project/pingchang/AppNucleicAcidSampling/Detail.vue
+++ b/src/project/pingchang/AppNucleicAcidSampling/Detail.vue
@@ -47,8 +47,7 @@
       </div>
     </div>
     <div class="btn-height"></div>
-    <!-- v-if="info.status != 2 && isHideBtn != 1"  -->
-    <div class="footer" @click="toAdd">采样</div>
+    <div class="footer" v-if="info.status != 2 && isHideBtn != 1" @click="toAdd">采样</div>
   </div>
 </template>