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

packages/wxwork/Announce/AppAnnounce/components/List.vue

@@ -143,7 +143,7 @@
       onUserChange (e) {
         if (e.length) {
           this.name = e[0].name
-          this.search.createUserId = e[0].id
+          this.search.createUserId = e[0].openId
         } else {
           this.search.createUserId = ''
           this.name = ''

packages/wxwork/AnnounceResident/AppAnnounceResident/components/Add.vue

@@ -34,12 +34,7 @@
                     <div class="AppAnnounceDetail-select">
                       <el-input size="small" class="AppAnnounceDetail-select__input" placeholder="请选择..." disabled v-model="form.wxGroupsName"></el-input>
                       <div class="select-left" v-if="form.wxGroups.length">
-                        <span v-for="(item, index) in form.wxGroups" :key="index" v-if="index < 9">
+                        <span v-for="(item, index) in form.wxGroups" :key="index" v-if="index < 9">{{ item.groupOwnerName }}</span>
-                          <ai-open-data
-                            type="userName"
-                            :openid="item.groupOwnerId">
-                            </ai-open-data>
-                        </span>
                         <em v-if="form.wxGroups.length > 9">等{{ form.wxGroups.length }}个</em>
                       </div>
                       <i v-if="!form.wxGroups.length">请选择</i>
@@ -373,6 +368,7 @@ export default {
       isShowAddMiniapp: false,
       isShowDate: false,
       isShowTags: false,
+      chooseTags: [],
       isLoading: false,
       linkForm: {
         linkPicUrl: [],
@@ -754,6 +750,33 @@ export default {
 .el-tooltip__popper.is-dark {
   max-width: 240px;
 }
+
+.tags {
+  .tag-item {
+    display: flex;
+    align-items: center;
+    padding-bottom: 30px;
+    padding-top: 30px;
+    border-bottom: 1px solid #EEEEEE;
+
+    &:first-child {
+      padding-top: 0;
+    }
+
+    .el-tag {
+      margin-right: 8px;
+      color: #222222;
+    }
+
+    h2 {
+      width: 88px;
+      margin-right: 40px;
+      text-align: right;
+      color: #888888;
+      font-size: 14px;
+    }
+  }
+}
 .AppAnnounceDetail-content-wrapper {
   display: flex;
   align-items: center;

packages/wxwork/AnnounceWeChat/AppAnnounceWeChat/components/Add.vue

@@ -604,6 +604,32 @@ export default {
 .el-tooltip__popper.is-dark {
   max-width: 240px;
 }
+.tags {
+  .tag-item {
+    display: flex;
+    align-items: center;
+    padding-bottom: 30px;
+    padding-top: 30px;
+    border-bottom: 1px solid #EEEEEE;
+
+    &:first-child {
+      padding-top: 0;
+    }
+
+    .el-tag {
+      margin-right: 8px;
+      color: #222222;
+    }
+
+    h2 {
+      width: 88px;
+      margin-right: 40px;
+      text-align: right;
+      color: #888888;
+      font-size: 14px;
+    }
+  }
+}
 .AppAnnounceDetail-content-wrapper {
   display: flex;
   align-items: center;

packages/wxwork/AnnounceWeChat/AppAnnounceWeChat/components/Detail.vue

@@ -25,15 +25,15 @@
             <ai-info-item label="创建人" isLine>
               <div class="user">
                 <img src="https://cdn.cunwuyun.cn/dvcp/announce/user.png" />
-                <span><ai-open-data type="userName" :openid="info.createUserId"></ai-open-data></span>
+                <span>{{ info.createUserName }}</span>
-                （<span><ai-open-data type="departmentName" :openid="info.createUserDept"></ai-open-data></span>）
+                <span>({{ info.createUserDeptName }})</span>
               </div>
             </ai-info-item>
             <ai-info-item label="审批人" isLine v-if="info.enableExamine === '1'">
               <div class="user-wrapper">
                 <div class="user" v-for="(item, index) in info.examines" :key="index">
                   <img src="https://cdn.cunwuyun.cn/dvcp/announce/user.png" />
-                  <span><ai-open-data type="userName" :openid="item.examineUserId"></ai-open-data></span>
+                  <span>{{ item.examineUserName }}</span>
                 </div>
               </div>
             </ai-info-item>
@@ -136,12 +136,8 @@
                 <el-table-column slot="user" label="成员" align="left">
                   <template slot-scope="{ row }">
                     <div class="userinfo">
-                      <span>
+                      <span>{{ row.groupOwnerName }}</span>
-                        <ai-open-data type="userName" :openid="row.groupOwnerId"></ai-open-data>
+                      <span style="color: #999">{{ row.mainDepartmentName }}</span>
-                      </span>
-                      <span style="color: #999">
-                        <ai-open-data type="departmentName" :openid="row.mainDepartment"></ai-open-data>
-                      </span>
                     </div>
                   </template>
                 </el-table-column>
@@ -193,7 +189,6 @@
         total1: 0,
         isShowGroups: false,
         isShowPhone: false,
-        total2: 0,
         user1: [],
         user2: [],
         radio1: '未执行',
@@ -204,13 +199,6 @@
           type: 0,
           sendStatus: '0'
         },
-        search2: {
-          current: 1,
-          size: 10,
-          deptartId: '',
-          type: 1,
-          sendStatus: '0'
-        },
         memberInfo: {},
         groupInfo: {},
         tableData1: [],
@@ -220,18 +208,13 @@
         content: '',
         currIndex: 0,
         colConfigs3: [
-          { prop: 'groupOwnerId', label: '群主', openType: 'userName' },
+          { prop: 'groupOwnerName', label: '群主' },
           { prop: 'groupNames', label: '群名称' }
         ],
         colConfigs1: [
-          { slot: 'user', label: '成员', openType: 'userName' },
+          { slot: 'user', label: '成员' },
           { prop: 'groupCount', label: '预计送达居民群', align: 'center' }
         ],
-        colConfigs2: [
-          { prop: 'groupName', label: '居民群' },
-          { prop: 'memberCount', label: '群人数', align: 'center' },
-          { slot: 'user', label: '群主', align: 'center' },
-        ],
         groups: [],
         timer: null,
         min: 60,
@@ -247,7 +230,6 @@
     created () {
       this.getInfo(this.params.id)
       this.getMemberInfo()
-      this.getGroupInfo()
     },
 
     destroyed () {
@@ -278,11 +260,7 @@
         }
 
         this[search].current = 1
-        if (search === 'search1') {
+        this.getMemberInfo()
-          this.getMemberInfo()
-        } else {
-          this.getGroupInfo()
-        }
       },
 
       sendMsg () {
@@ -294,26 +272,6 @@
         })
       },
 
-      getGroupInfo () {
-        this.instance.post(`/app/appmasssendingtask/detailStatistics`, null, {
-          params: {
-            ...this.search2,
-            taskId: this.params.id
-          }
-        }).then(res => {
-          if (res.code === 0) {
-            this.tableData2 = res.data.executedList.records.map(v => {
-              return {
-                ...v,
-                groupName: v.groupName || '未命名群聊'
-              }
-            })
-            this.total2 = res.data.executedList.total
-            this.groupInfo = res.data
-          }
-        })
-      },
-
       countdown () {
         this.timer = setInterval(() => {
           const nowTime = this.$moment(new Date())

packages/wxwork/AnnounceWeChat/AppAnnounceWeChat/components/List.vue

@@ -33,14 +33,14 @@
             @change="search.current = 1, getList()"
             placeholder="选择群发结束日期">
           </el-date-picker>
-          <ai-user-get :instance="instance" @change="onUserChange" :isMultiple="false" v-model="user">
+          <ai-wechat-selecter :instance="instance" @change="onUserChange" :isMultiple="false" v-model="user">
             <div class="userSelcet">
-              <span style="color: #606266;" v-if="search.createUserId"><ai-open-data type="userName" :openid="search.createUserId"></ai-open-data></span>
+              <span style="color: #606266;" v-if="search.createUserId">{{ name }}</span>
               <span v-else>创建人</span>
               <i class="el-icon-arrow-up"  v-if="!search.createUserId"></i>
-              <i class="el-icon-circle-close" v-if="search.createUserId" @click.stop="user = [], search.createUserId = '', search.current = 1, getList()"></i>
+              <i class="el-icon-circle-close" v-if="search.createUserId" @click.stop="user = [], search.createUserId = '', name = '', search.current = 1, getList()"></i>
             </div>
-          </ai-user-get>
+          </ai-wechat-selecter>
         </template>
         <template slot="right">
           <el-input
@@ -66,12 +66,8 @@
         <el-table-column slot="user" width="140px" label="创建人" align="center">
           <template slot-scope="{ row }">
             <div class="userinfo">
-              <span>
+              <span>{{ row.createUserName }}</span>
-                <ai-open-data type="userName" :openid="row.createUserId"></ai-open-data>
+              <span style="color: #999">{{ row.createUserDeptName }}</span>
-              </span>
-              <span style="color: #999">
-                <ai-open-data type="departmentName" :openid="row.createUserDept"></ai-open-data>
-              </span>
             </div>
           </template>
         </el-table-column>
@@ -145,9 +141,11 @@
     methods: {
       onUserChange (e) {
         if (e.length) {
-          this.search.createUserId = e[0].wxOpenUserId
+          this.name = e[0].name
+          this.search.createUserId = e[0].id
         } else {
           this.search.createUserId = ''
+          this.name = ''
         }
 
         this.search.current = 1