Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_cp/dv_cp_wechat_app into dev

src/apps/AppMeetingNotice/components/detail.vue

@@ -50,19 +50,21 @@
         </u-row>
       </div>
 
-      <div class="footer" v-if="['1','2'].includes(detail.status) && detail.joinStatus==0">
-        <div @click="updateStatus(0)">请假</div>
-        <div @click="toDo">待定</div>
-        <div @click="updateStatus(1)">确认会议</div>
-      </div>
-
-      <div class="footer" v-if="['1','2'].includes(detail.status) && detail.joinStatus!=0">
-        <label>{{ detail.joinStatus|transform }}</label>
-        <img :src="$cdn + tag(detail.joinStatus)" alt="">
-      </div>
-
       <div class="footer cancel" v-if="detail.status==1 && detail.createUserId == user.id" @click="handleCancel">取消会议</div>
 
+      <template v-else>
+        <div class="footer" v-if="['1','2'].includes(detail.status) && ['0','3'].includes(detail.joinStatus)">
+          <div @click="updateStatus(0)">请假</div>
+          <div @click="toDo">待定</div>
+          <div @click="updateStatus(1)">确认会议</div>
+        </div>
+
+        <div class="footer" v-if="['1','2'].includes(detail.status) && detail.joinStatus!=0">
+          <label>{{ detail.joinStatus|transform }}</label>
+          <img :src="$cdn + tag(detail.joinStatus)" alt="">
+        </div>
+      </template>
+
     </template>
     <template v-else>
       <div class="att-list">

src/apps/AppNotification/components/add.vue

@@ -121,7 +121,7 @@
     methods: {
       ...mapActions(['selectEnterpriseContact']),
       handleSelectUser() {
-        this.selectEnterpriseContact({type:["department", "user"]}).then(res => {
+        this.selectEnterpriseContact({fromDepartmentId:0,type:["department", "user"]}).then(res => {
           this.form.persons = res?.userList || []
         })
       },