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

2021-12-03 15:30:17 +08:00
parent 15a3b4291c 406e03e100
commit f38b74aebe
5 changed files with 387 additions and 364 deletions
--- a/src/apps/AppMeetingNotice/AppMeetingNotice.vue
+++ b/src/apps/AppMeetingNotice/AppMeetingNotice.vue
@@ -6,7 +6,7 @@
          <u-grid-item v-for="(item,index) in grid" :key="index" :custom-style="{padding:'14px 0'}"
                       @click="handleClick(index)">
            <u-icon :name="item.icon" :size="64"></u-icon>
-            <view class="label">{{item.label}}</view>
+            <view class="label">{{ item.label }}</view>
          </u-grid-item>
        </u-grid>
      </ai-top-fixed>
@@ -14,26 +14,30 @@
        <header>待参加的会议</header>
        <template v-if="meetingList.length">
          <div class="card" v-for="(item,index) in meetingList" :key="index" @click="detail(item)">
-            <header>{{item.title}}</header>
+            <header>{{ item.title }}</header>
            <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|format }}</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|format }}</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">
              <span>会议地点：</span>
-              <span>{{item.address}}</span>
+              <span>{{ item.address }}</span>
            </u-row>
            <div class="tag" :style="{background:'url(' + $cdn + tag(item.joinStatus) + ')'}"></div>
          </div>
@@ -50,15 +54,16 @@
 </template>

 <script>
-  import AiEmpty from "../../components/AiEmpty";
-  import AiTopFixed from "../../components/AiTopFixed";
-  import AiAdd from "../../components/AiAdd";
-  import {addMeeting, belongToMe, detail, meetingList} from './components'
+import AiEmpty from "../../components/AiEmpty";
+import AiTopFixed from "../../components/AiTopFixed";
+import AiAdd from "../../components/AiAdd";
+import {addMeeting, belongToMe, detail, meetingList} from './components'
+import AiOpenData from "../../components/AiOpenData";

-  export default {
+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: [],
@@ -89,9 +94,9 @@
    }
  },
  methods: {
-      emitShow(){
+    emitShow() {
      const {id} = this.$route.query
-        if(id){
+      if (id) {
        this.comp = "detail";
        this.params = id;
        this.isList = false;
@@ -151,11 +156,11 @@
    }
  },

-  }
+}
 </script>

 <style lang="scss" scoped>
-  .meeting {
+.meeting {
  min-height: 100%;
  background: #F5F5F5;
  padding-bottom: 48px;
@@ -269,5 +274,5 @@
  ::v-deep .content {
    padding: 0 !important;
  }
-  }
+}
 </style>
--- a/src/apps/AppMeetingNotice/components/addMeeting.vue
+++ b/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 || [])
      })
    },
--- a/src/apps/AppMeetingNotice/components/belongToMe.vue
+++ b/src/apps/AppMeetingNotice/components/belongToMe.vue
@@ -6,26 +6,26 @@
    <div class="body">
      <template v-if="list.length">
        <div class="card" v-for="(item,index) in list" :key="index" @click="handleClick(item)">
-          <header>{{item.title}}</header>
+          <header>{{ item.title }}</header>
          <u-row justify="between">
            <div class="time">
-              <span>{{item.startTime|formatTime}}</span>
-              <span>{{item.startTime|formatDate(0)}}年{{item.startTime|formatDate(1)}}月{{item.startTime|formatDate(2)}}日 周{{item.startTime|formatWeek}}</span>
+              <span>{{ item.startTime|formatTime }}</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|formatTime}}</span>
-              <span>{{item.endTime|formatDate(0)}}年{{item.endTime|formatDate(1)}}月{{item.endTime|formatDate(2)}}日 周{{item.endTime|formatWeek}}</span>
+              <span>{{ item.endTime|formatTime }}</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.unitName}}</span>
+            <ai-open-data type="departmentName" :openid="item.unitName"/>
          </u-row>
          <u-gap height="20"></u-gap>
          <u-row class="info">
            <span>会议地点：</span>
-            <span>{{item.address}}</span>
+            <span>{{ item.address }}</span>
          </u-row>
          <div class="tag" :style="{background:'url(' + tag(item.status) + ')'}"></div>
        </div>
@@ -39,13 +39,14 @@
 </template>

 <script>
-  import AiTopFixed from "../../../components/AiTopFixed";
-  import AiBack from "../../../components/AiBack";
-  import AiEmpty from "../../../components/AiEmpty";
+import AiTopFixed from "../../../components/AiTopFixed";
+import AiBack from "../../../components/AiBack";
+import AiEmpty from "../../../components/AiEmpty";
+import AiOpenData from "../../../components/AiOpenData";

-  export default {
+export default {
  name: "belongToMe",
-    components: {AiTopFixed, AiBack, AiEmpty},
+  components: {AiOpenData, AiTopFixed, AiBack, AiEmpty},
  data() {
    return {
      index: 0,
@@ -69,7 +70,7 @@
    this.getList()
  },
  methods: {
-      emitReachBottom(){
+    emitReachBottom() {
      this.current = this.current + 1;
      this.getList()
    },
@@ -121,11 +122,11 @@
      return "日一二三四五六".charAt(new Date(date.split(" ")[0]).getDay())
    },
  }
-  }
+}
 </script>

 <style lang="scss" scoped>
-  .belong-to-me {
+.belong-to-me {
  min-height: 100%;
  background-color: #F5F5F5;

@@ -226,5 +227,5 @@
      }
    }
  }
-  }
+}
 </style>
--- a/src/apps/AppNotification/components/add.vue
+++ b/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){
--- a/src/components/AiOpenData.vue
+++ b/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'])
  },