Merge remote-tracking branch 'origin/dev' into dev

src/apps/AppInterview/AppInterview.vue

@@ -8,7 +8,7 @@
         </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)">
+        <ai-card :ref="'aiCard' + index" v-for="(e,index) in list" :key="index" @click.native="goDetail(e.id,1)">
           <template #custom>
             <div flex>
               <b class="fill">{{ e.title }}</b>
@@ -20,7 +20,7 @@
           </template>
           <template #menu>
             <div class="menu" @tap.stop="goDetail(e.id)">编辑</div>
-            <div class="menu" @tap.stop="handleDelete(e.id)">删除</div>
+            <div class="menu" @tap.stop="handleDelete(e.id, index)">删除</div>
           </template>
         </ai-card>
         <u-loadmore :status="loadmore" color="#999" font-size="24"
@@ -107,7 +107,8 @@ export default {
     gotoAdd() {
       this.root.goto({hash: "#add"})
     },
-    handleDelete(ids) {
+    handleDelete(ids, index) {
+      this.$refs[`aiCard${index}`][0].handleClose()
       this.$confirm("是否要删除该调查走访").then(() => {
         this.$http.post("/app/appinterview/delete", null, {
           params: {ids}

src/apps/AppInterview/interviewDetail.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="interviewDetail">
     <template v-if="isEdit">
-      <u-form ref="interviewForm" label-position="top" :rules="rules" :model="form">
+      <u-form ref="interviewForm" label-position="top" :model="form">
         <u-form-item label="调查走访事项" prop="title" required>
           <u-input v-model="form.title" placeholder="请输入，最多30字" maxlength="30"/>
         </u-form-item>
@@ -47,12 +47,6 @@ export default {
       let flag = this.$route.query?.detail != 1
       document.title = flag ? "新增走访" : "走访详情"
       return flag
-    },
-    rules() {
-      return {
-        title: [{required: true, message: '请输入 调查走访事项'}],
-        // content: [{required: true, message: '请输入 调查走访内容'}],
-      }
     }
   },
   data() {
@@ -62,11 +56,17 @@ export default {
       }
     }
   },
+  mounted() {
+	},
   created() {
     this.searchDetail();
   },
   methods: {
     submitForm() {
+      if (!this.form.title) {
+        return this.$u.toast("请输入调查走访事项")
+      }
+
       this.$refs.interviewForm?.validate(v => {
         if (v) {
           this.$http.post(`/app/appinterview/add-xcx`, {