From e91ea0a4237f01b50dc04240d2c8b653f8733017 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Thu, 18 Nov 2021 17:53:42 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=9F=A5=E8=B5=B0=E8=AE=BF=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90=E6=94=B9=E9=80=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/apps/AppInterview/AppInterview.vue        | 84 +++++++++++--------
 .../{detail.vue => interviewDetail.vue}       |  5 +-
 src/components/AiDate.vue                     | 12 +--
 src/components/AiTextarea.vue                 |  2 -
 4 files changed, 55 insertions(+), 48 deletions(-)
 rename src/apps/AppInterview/{detail.vue => interviewDetail.vue} (93%)

diff --git a/src/apps/AppInterview/AppInterview.vue b/src/apps/AppInterview/AppInterview.vue
index 8f38285d..686411d9 100644
--- a/src/apps/AppInterview/AppInterview.vue
+++ b/src/apps/AppInterview/AppInterview.vue
@@ -1,37 +1,40 @@
 <template>
   <div class="AppInterview">
-    <ai-top-fixed>
-      <div flex>
-        <ai-date placeholder="日期选择" mode="range" @change="handleDateSearch"/>
-        <u-search placeholder="请输入标题" :show-action="false" v-model="search.title" @search="current=1,getList()"/>
+    <template v-if="!showDetail">
+      <ai-top-fixed>
+        <div flex>
+          <ai-date placeholder="日期选择" mode="range" @change="handleDateSearch"/>
+          <u-search placeholder="请输入标题" :show-action="false" v-model="search.title" @search="current=1,getList()"/>
+        </div>
+      </ai-top-fixed>
+      <template v-if="list.length>0">
+        <ai-card v-for="(e,index) in list" :key="index" @click.native="goDetail(e.id,1)">
+          <template #custom>
+            <div flex>
+              <b class="fill">{{ e.title }}</b>
+            </div>
+            <div flex v-if="!!e.fileList" class="wrap">
+              <ai-image v-for="(op,i) in e.fileList.slice(0,3)" :src="op.accessUrl" preview :key="i"/>
+            </div>
+            <div class="bottom">{{ e.createTime }}</div>
+          </template>
+          <template #menu>
+            <div class="menu" @tap.stop="goDetail(e.id)">编辑</div>
+            <div class="menu" @tap.stop="handleDelete(e.id)">删除</div>
+          </template>
+        </ai-card>
+        <u-loadmore :status="loadmore" color="#999" font-size="24"
+                    margin-top="32" margin-bottom="80"/>
+      </template>
+      <div class="no-message" v-else>
+        <image src="https://cdn.cunwuyun.cn/wxAdmin/img/message.png"/>
+        <p>您还未添加过入户调查走访<br>点击<b>新增按钮</b>试试吧~</p>
       </div>
-    </ai-top-fixed>
-    <template v-if="list.length>0">
-      <ai-card v-for="(e,index) in list" :key="index" @click.native="goDetail(e.id,1)">
-        <template #custom>
-          <div flex>
-            <b class="fill">{{ e.title }}</b>
-          </div>
-          <div flex v-if="!!e.fileList" class="wrap">
-            <ai-image v-for="(op,i) in e.fileList.slice(0,3)" :src="op.accessUrl" preview :key="i"/>
-          </div>
-          <div class="bottom">{{ e.createTime }}</div>
-        </template>
-        <template #menu>
-          <div class="menu" @tap.stop="goDetail(e.id)">编辑</div>
-          <div class="menu" @tap.stop="handleDelete(e.id)">删除</div>
-        </template>
-      </ai-card>
-      <u-loadmore :status="loadmore" color="#999" font-size="24"
-                  margin-top="32" margin-bottom="80"/>
+      <ai-fixed-btn>
+        <div class="addBtn iconfont iconfont-iconfangda" @tap="gotoAdd()"/>
+      </ai-fixed-btn>
     </template>
-    <div class="no-message" v-else>
-      <image src="https://cdn.cunwuyun.cn/wxAdmin/img/message.png"/>
-      <p>您还未添加过入户调查走访<br>点击<b>新增按钮</b>试试吧~</p>
-    </div>
-    <ai-fixed-btn>
-      <div class="addBtn iconfont iconfont-iconfangda" @tap="gotoAdd()"/>
-    </ai-fixed-btn>
+    <interview-detail v-else/>
   </div>
 </template>
 
@@ -42,11 +45,15 @@ import AiCard from "../../components/AiCard";
 import AiImage from "../../components/AiImage";
 import AiDate from "../../components/AiDate";
 import AiFixedBtn from "../../components/AiFixedBtn";
+import InterviewDetail from "./interviewDetail";
 
 export default {
   name: "AppInterview",
   appName: "调查走访",
-  components: {AiFixedBtn, AiDate, AiImage, AiCard, AiTopFixed, AiSelect},
+  inject: {
+    root: {}
+  },
+  components: {InterviewDetail, AiFixedBtn, AiDate, AiImage, AiCard, AiTopFixed, AiSelect},
   data() {
     return {
       search: {title: ""},
@@ -58,6 +65,9 @@ export default {
   computed: {
     loadmore() {
       return this.pages <= this.current ? 'loading ' : 'nomore'
+    },
+    showDetail() {
+      return this.$route.hash == "#add"
     }
   },
   onShow() {
@@ -84,12 +94,12 @@ export default {
       })
     },
     goDetail(id, readonly) {
-      let url = `./detail?id=${id}`
-      readonly && (url += "&detail=1")
-      uni.navigateTo({url})
+      let query = {id}
+      readonly && (query.detail = 1)
+      this.root.goto({hash: "#add", query})
     },
     gotoAdd() {
-      uni.navigateTo({url: `./detail`})
+      this.root.goto({hash: "#add"})
     },
     handleDelete(ids) {
       this.$confirm("是否要删除该调查走访").then(() => {
@@ -104,8 +114,8 @@ export default {
       })
     },
     handleDateSearch(v) {
-      this.search.startTime = v.startDate
-      this.search.endTime = v.endDate || v.startDate
+      this.search.startTime = v?.[0]
+      this.search.endTime = v?.[0] || v?.[1]
       this.current = 1
       this.getList()
     }
diff --git a/src/apps/AppInterview/detail.vue b/src/apps/AppInterview/interviewDetail.vue
similarity index 93%
rename from src/apps/AppInterview/detail.vue
rename to src/apps/AppInterview/interviewDetail.vue
index 8452b784..8c30becb 100644
--- a/src/apps/AppInterview/detail.vue
+++ b/src/apps/AppInterview/interviewDetail.vue
@@ -33,17 +33,14 @@
 </template>
 
 <script>
-import UButton from "../../uview/components/u-button/u-button";
 import AiUploader from "../../components/AiUploader";
-import UInput from "../../uview/components/u-input/u-input";
 import AiImage from "../../components/AiImage";
 import AiTextarea from "../../components/AiTextarea";
-import UFormItem from "../../uview/components/u-form-item/u-form-item";
 import AiBack from "../../components/AiBack";
 
 export default {
   name: 'interviewDetail',
-  components: {AiBack, UFormItem, AiTextarea, AiImage, UInput, AiUploader, UButton},
+  components: {AiBack, AiTextarea, AiImage, AiUploader},
   computed: {
     isEdit() {
       let flag = this.$route.query?.detail != 1
diff --git a/src/components/AiDate.vue b/src/components/AiDate.vue
index 51d1d773..af69d7f9 100644
--- a/src/components/AiDate.vue
+++ b/src/components/AiDate.vue
@@ -1,6 +1,7 @@
 <template>
   <section class="AiDate">
-    <u-calendar v-model="show" @change="handleSelect" :mode="mode"/>
+    <u-calendar :show="show" :maxDate="maxDate"
+                @confirm="handleSelect" :mode="mode" @close="show=false"/>
     <div flex @click="show=true">
       <div v-if="label" v-html="label"/>
       <div v-else v-html="placeholder"/>
@@ -31,16 +32,17 @@ export default {
     value: {default: ""},
     placeholder: {default: "请选择"},
     mode: {default: "single"},//date 单个日期|range 日期范围
+    maxDate:String
   },
   methods: {
     handleSelect(v) {
+      this.show = false
       if (this.mode == 'date') {
-        this.selected = v.result
-        this.$emit('change', v.result)
+        this.selected = v?.[0]
       } else if (this.mode == 'range') {
-        this.selected = [v.startDate, v.endDate]
-        this.$emit('change', v)
+        this.selected = [v?.[0], v?.slice(-1)?.[0]]
       }
+      this.$emit('change', this.selected)
     }
   }
 }
diff --git a/src/components/AiTextarea.vue b/src/components/AiTextarea.vue
index d8953e37..b9c45a43 100644
--- a/src/components/AiTextarea.vue
+++ b/src/components/AiTextarea.vue
@@ -12,11 +12,9 @@
 </template>
 
 <script>
-import UInput from "../uview/components/u-input/u-input";
 
 export default {
   name: "AiTextarea",
-  components: {UInput},
   model: {
     prop: "value",
     event: "change"