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

src/apps/AppResidentActivitie/Add.vue

@@ -9,7 +9,6 @@
         <u-form-item label="活动详情" prop="content" required :border-bottom="false" label-position="top" class="contents">
           <!-- <u-input v-model="forms.content" placeholder="请输入活动详情(500字以内)" type="textarea" auto-height height="100" maxlength="500" /> -->
           <AiEditor v-model="forms.content" placeholder="请输入活动详情(500字以内)" :maxlength="500" />
-
         </u-form-item>
 
         <div class="line"></div>
@@ -206,11 +205,29 @@ export default {
 
     confirm(e) {
       if (this.showStartTime == true) {
+        var nowTime = new Date().getTime() * 1
+
+        var historyTime = new Date(e.year + '-' + e.month + '-' + e.day + ' ' + e.hour + ':' + e.minute + ':' + '00').getTime() * 1
+
+        if (nowTime > historyTime) {
+          this.forms.beginTime = ''
+          return this.$u.toast('开始时间应大于当前时间')
+        } else {
           this.forms.beginTime = e.year + '-' + e.month + '-' + e.day + ' ' + e.hour + ':' + e.minute + ':' + '00'
         }
+      }
       if (this.showEndTime == true) {
+        var nowTime = new Date().getTime() * 1
+
+        var historyTime = new Date(e.year + '-' + e.month + '-' + e.day + ' ' + e.hour + ':' + e.minute + ':' + '00').getTime() * 1
+
+        if (nowTime > historyTime) {
+          this.forms.endTime = ''
+          return this.$u.toast('结束时间应大于当前时间')
+        } else {
           this.forms.endTime = e.year + '-' + e.month + '-' + e.day + ' ' + e.hour + ':' + e.minute + ':' + '00'
         }
+      }
     },
 
     areaSelect(e) {

src/apps/AppWalkask/AppWalkask.vue

@@ -41,7 +41,7 @@
                 </div>
               </template>
 
-              <template #menu>
+              <template #menu v-if="item.createUserId == user.id">
                 <div class="menu" @tap.stop="goDetail(item, 2)">编辑</div>
                 <div class="menu" @tap.stop="toDetele(item)">删除</div>
               </template>

src/apps/AppWalkask/add.vue

@@ -13,14 +13,14 @@
 
           <div class="line"></div>
 
-          <u-form-item label="走访对象" prop="create_user_name" required right-icon="arrow-right" class="create_user_names">
+          <u-form-item label="走访对象" prop="create_user_name" required :right-icon=" id ? '' : 'arrow-right'" class="create_user_names">
             <u-input v-model="forms.create_user_name" disabled placeholder="请选择走访对象" @click="toWalkObject" />
           </u-form-item>
 
           <div class="line"></div>
 
-          <u-form-item label="现实状态" prop="reality" right-icon="arrow-right" class="realitys">
+          <u-form-item label="现实状态" prop="reality" :right-icon=" id ? '' : 'arrow-right'" class="realitys">
-            <u-input v-model="forms.reality" disabled placeholder="请选择现实状态" @click="showStstus = true" />
+            <u-input v-model="forms.reality" disabled placeholder="请选择现实状态" @click="realityClick" />
 
             <u-select v-model="showStstus" :list="$dict.getDict('realityStatus')" value-name="dictValue" label-name="dictName" @confirm="realityStstus"></u-select>
           </u-form-item>
@@ -103,6 +103,13 @@ export default {
   },
   mounted() {},
   methods: {
+    realityClick() {
+      if(this.id) return 
+      if (!this.forms.create_user_name) {
+        return this.$u.toast('请选择走访慰问对象')
+      }
+      this.showStstus = true
+    },
     getDetail() {
       if (this.id) {
         this.$http.post(`/app/appvisitvondolence/queryDetailById?id=${this.id}`).then((res) => {
@@ -171,6 +178,7 @@ export default {
     },
 
     areaSelect(e) {
+      console.log(e)
       this.forms.areaId = e
     },
 
@@ -188,6 +196,7 @@ export default {
     },
 
     toWalkObject() {
+      if(this.id) return
       this.addList = false
       this.comp = 'walkObject'
       this.paramss = 111