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

src/apps/AppMeetingNotice/AppMeetingNotice.vue

@@ -18,17 +18,21 @@
             <u-row justify="between">
               <div class="time">
                 <span>{{ item.startTime|format }}</span>
-                <span>{{item.startTime|formatDate(0)}}年{{item.startTime|formatDate(1)}}月{{item.startTime|formatDate(2)}}日 周{{item.startTime|formatWeek}}</span>
+                <span>{{ item.startTime|formatDate(0) }}年{{
+                    item.startTime|formatDate(1)
+                  }}月{{ item.startTime|formatDate(2) }}日 周{{ item.startTime|formatWeek }}</span>
               </div>
               <div class="arrow"></div>
               <div class="time">
                 <span>{{ item.endTime|format }}</span>
-                <span>{{item.endTime|formatDate(0)}}年{{item.endTime|formatDate(1)}}月{{item.endTime|formatDate(2)}}日 周{{item.endTime|formatWeek}}</span>
+                <span>{{ item.endTime|formatDate(0) }}年{{ item.endTime|formatDate(1) }}月{{
+                    item.endTime|formatDate(2)
+                  }}日 周{{ item.endTime|formatWeek }}</span>
               </div>
             </u-row>
             <u-row class="info">
               <span>发起人员：</span>
-              <span>{{item.userName}}</span>
+              <ai-open-data type="userName" :openid="item.createUserId"/>
             </u-row>
             <u-gap height="20"></u-gap>
             <u-row class="info">
@@ -54,11 +58,12 @@
 import AiTopFixed from "../../components/AiTopFixed";
 import AiAdd from "../../components/AiAdd";
 import {addMeeting, belongToMe, detail, meetingList} from './components'
+import AiOpenData from "../../components/AiOpenData";
 
 export default {
   name: "AppMeetingNotice",
   appName: "会议通知",
-    components: {AiEmpty, AiTopFixed, AiAdd, addMeeting, belongToMe, detail, meetingList},
+  components: {AiOpenData, AiEmpty, AiTopFixed, AiAdd, addMeeting, belongToMe, detail, meetingList},
   data() {
     return {
       meetingList: [],

src/apps/AppMeetingNotice/components/addMeeting.vue

@@ -158,7 +158,11 @@ export default {
   methods: {
     ...mapActions(['selectEnterpriseContact']),
     handleSelectUser() {
-      this.selectEnterpriseContact({fromDepartmentId:0,type:["department", "user"]}).then(res => {
+      this.selectEnterpriseContact({
+        fromDepartmentId:0,
+        type:["department", "user"],
+        selectedUserIds: this.form.attendees?.map(e=>e.id)
+      }).then(res => {
         this.change(res?.userList || [])
       })
     },

src/apps/AppMeetingNotice/components/belongToMe.vue

@@ -20,7 +20,7 @@
           </u-row>
           <u-row class="info">
             <span>发起单位：</span>
-            <span>{{item.unitName}}</span>
+            <ai-open-data type="departmentName" :openid="item.unitName"/>
           </u-row>
           <u-gap height="20"></u-gap>
           <u-row class="info">
@@ -42,10 +42,11 @@
 import AiTopFixed from "../../../components/AiTopFixed";
 import AiBack from "../../../components/AiBack";
 import AiEmpty from "../../../components/AiEmpty";
+import AiOpenData from "../../../components/AiOpenData";
 
 export default {
   name: "belongToMe",
-    components: {AiTopFixed, AiBack, AiEmpty},
+  components: {AiOpenData, AiTopFixed, AiBack, AiEmpty},
   data() {
     return {
       index: 0,

src/apps/AppNotification/components/add.vue

@@ -121,8 +121,13 @@
     methods: {
       ...mapActions(['selectEnterpriseContact']),
       handleSelectUser() {
-        this.selectEnterpriseContact({fromDepartmentId:0,type:["department", "user"]}).then(res => {
+        this.selectEnterpriseContact({
+          fromDepartmentId:0,
+          type:["department", "user"],
+          selectedUserIds: this.form.persons?.map(e=>e.id)
+        }).then(res => {
           this.form.persons = res?.userList || []
+          console.log(this.form.persons);
         })
       },
       confirm(e){

src/components/AiOpenData.vue

@@ -1,5 +1,5 @@
 <template>
-  <div :type="type" :openid="openid" v-text="openid"/>
+  <div :type="type" :openid="oid" v-text="oid"/>
 </template>
 
 <script>
@@ -8,6 +8,14 @@ import {mapActions} from "vuex";
 export default {
   name: "AiOpenData",
   props: ['type', 'openid'],
+  computed: {
+    oid() {
+      /**
+       * 后端返回格式(cropId|userId)
+       */
+      return this.openid?.split("|")?.[1] || this.openid || ""
+    }
+  },
   methods: {
     ...mapActions(['injectJWeixin'])
   },