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

src/apps/AppMeetingNotice/addMeeting.vue

@@ -37,7 +37,7 @@
                     :def="form.files" action="/admin/file/add2"></AiUploader>
       </div>
 
-      <div class="card item-wrap" @click="select">
+      <div class="card item-wrap">
         <u-row justify="between" class="item" @click="handleSelectUser">
           <header><em>*</em>参会人</header>
           <div class="right">
@@ -126,22 +126,29 @@ export default {
       clickedUserSelect: false
     }
   },
-  created() {
+
-    document.title = "新增会议";
+  onLoad(opt) {
-    if (this.params) {
+    if(opt.id) {
-      this.form.id = this.params;
+      this.form.id = opt.id
-      this.getDetail();
+      this.getDetail()
     }
-    this.$nextTick(() => {
+
+    this.$nextTick(()=>{
       let date = new Date();
       this.form.startTime.time = date.getHours()?.toString()?.padStart(2, "0") + ":" + date.getMinutes()?.toString()?.padStart(2, "0")
       this.form.startTime.year = date.getFullYear()
-      this.form.startTime.month = (date.getMonth() + 1)?.toString()?.padStart(2, "0")
+      this.form.startTime.month = (date.getMonth()+1)?.toString()?.padStart(2, "0")
       this.form.startTime.day = date.getDate()
       this.form.startTime.weekday = '日一二三四五六'.charAt(date.getDay())
       this.form.endTime = {...this.form.startTime}
     })
   },
+
+  onShow(){
+    document.title = "新增会议";
+    this.$dict.load("meetingNoticeBefore", "meetingNoticeAfter");
+  },
+
   computed: {
     options() {
       return {
@@ -260,11 +267,6 @@ export default {
       this.index = index
       this.show = true
     },
-    select() {
-      uni.navigateTo({
-        url: "/pages/meetingNotice/components/notice"
-      })
-    }
   },
 }
 </script>