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

project/qianxinan/Announce/AppAnnounce/components/Add.vue

@@ -20,14 +20,14 @@
                     <!-- <el-radio label="2">按网格选择</el-radio> -->
                   </el-radio-group>
                 </el-form-item>
-                <el-form-item label="选择群主" v-if="form.sendScope !== '0'" prop="wxGroupsName" style="width: 100%;" :rules="[{ required: true, message: '请选择选择群主', trigger: 'change' }]">
+                <el-form-item label="选择群主" v-if="form.sendScope !== '0'" prop="wxGroupsName" style="width: 100%;" :rules="[{ required: true, message: '请选择选择群主', trigger: 'change' }]" >
                   <ai-picker
                     :instance="instance"
                     multiple
                     :dialogTitle="form.sendScope === '2' ? '选择网格' : '选择部门'"
                     :ops="{label: form.sendScope === '2' ? 'girdName' : 'name'}"
                     :pageTitle="form.sendScope === '2' ? '网格' : '部门'"
-                    :action="form.sendScope === '1' ? '/app/wxcp/wxdepartment/departList' : '/app/appgirdinfo/girdList'"
+                    :action="form.sendScope === '1' ? `/app/wxcp/wxdepartment/departList` : '/app/appgirdinfo/girdList'"
                     v-model="form.filterCriteria"
                     @pick="onPick"
                     @change="onSelcetChange">
@@ -700,6 +700,10 @@ export default {
       })
     },
 
+    selectDept() {
+      return this.$message.error(`您未在系统中关联‘主部门’，请联系管理员处理`)
+    },
+
     cancel(isRefresh) {
       this.$emit('change', {
         type: 'list',
@@ -967,5 +971,17 @@ export default {
       font-style: normal;
     }
   }
+  .select-div {
+    width: 100%;
+    height: 32px;
+    line-height: 32px;
+    border-radius: 4px;
+    border: 1px solid #ddd;
+    padding: 0 15px;
+    box-sizing: border-box;
+    font-size: 14px;
+    color: #999;
+    cursor: pointer;
+  }
 }
 </style>

project/qianxinan/Announce/AppAnnounce/components/List.vue

@@ -41,12 +41,12 @@
             @change="search.current = 1, getList()"
             placeholder="选择群发结束日期">
           </el-date-picker>
-          <ai-user-selecter :instance="instance" @change="onUserChange" :isMultiple="false" v-model="user">
+          <ai-user-selecter :instance="instance" @change="onUserChange" :isMultiple="false" v-model="userList" :actions="{tree: `/app/wxcp/wxdepartment/departList?id=${user.info.wxMainDepartmentId}`}" >
             <div class="userSelcet">
               <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 = '', name = '', search.current = 1, getList()"></i>
+              <i class="el-icon-circle-close" v-if="search.createUserId" @click.stop="userList = [], search.createUserId = '', name = '', search.current = 1, getList()"></i>
             </div>
           </ai-user-selecter>
         </template>
@@ -96,6 +96,7 @@
 </template>
 
 <script>
+  import { mapState } from 'vuex'
   export default {
     name: 'List',
 
@@ -119,7 +120,7 @@
         currIndex: '1',
         name: '',
         isShow: false,
-        user: [],
+        userList: [],
         tableData: [],
         loading: false,
         total: 0,
@@ -146,6 +147,9 @@
         ]
       }
     },
+    computed: {
+      ...mapState(['user']),
+    },
 
     created () {
       this.dict.load('mstStatus', 'mstSendType', 'mstTag').then(() => {