From 37b470cc6cbc74e378222e4987c3daac46285f24 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Tue, 9 Aug 2022 14:49:40 +0800
Subject: [PATCH] 30779

---
 .../Announce/AppAnnounce/components/Add.vue   | 76 ++++++++++---------
 1 file changed, 41 insertions(+), 35 deletions(-)

diff --git a/project/sass/apps/Announce/AppAnnounce/components/Add.vue b/project/sass/apps/Announce/AppAnnounce/components/Add.vue
index 63fab872..92a3e706 100644
--- a/project/sass/apps/Announce/AppAnnounce/components/Add.vue
+++ b/project/sass/apps/Announce/AppAnnounce/components/Add.vue
@@ -20,28 +20,27 @@
                     <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' }]">
-                  <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">
-                        <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>
-                    <ai-picker
-                        :instance="instance"
-                        multiple
-                        :ops="{label: form.sendScope === '2' ? 'girdName' : 'name'}"
-                        :action="form.sendScope === '1' ? '/app/wxcp/wxdepartment/departList' : '/app/appgirdinfo/girdList'"
-                        v-model="form.filterCriteria"
-                        @pick="onPick"
-                        @change="onSelcetChange">
+                <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
+                    :ops="{label: form.sendScope === '2' ? 'girdName' : 'name'}"
+                    :action="form.sendScope === '1' ? '/app/wxcp/wxdepartment/departList' : '/app/appgirdinfo/girdList'"
+                    v-model="form.filterCriteria"
+                    @pick="onPick"
+                    @change="onSelcetChange">
+                    <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">
+                          <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>
                       <div class="select-right">{{ form.filterCriteria.length ? '重新选择' : '选择' }}</div>
-                    </ai-picker>
-                  </div>
+                    </div>
+                  </ai-picker>
                   <div class="tips">
                     <p>消息预计送达居民群数：</p>
                     <span>{{ groupLen }}</span>
@@ -145,20 +144,19 @@
                       active-text="开启后，创建的群发任务需要审批人进行审批">
                   </el-switch>
                 </el-form-item>
-                <el-form-item v-if="form.enableExamine === '1'" label="审批人员" prop="examines" style="width: 100%;"
-                              :rules="[{ required: true, message: '请选择审批人员', trigger: 'change' }]">
-                  <div class="AppAnnounceDetail-select">
-                    <el-input class="AppAnnounceDetail-select__input" size="small" placeholder="请选择..." v-model="form.examinesName"></el-input>
-                    <div class="select-left" v-if="form.examines.length">
-                      <span v-for="(item, index) in form.examines" :key="index">
-                        <ai-open-data type="userName" :openid="item.wxOpenUserId"></ai-open-data>
-                      </span>
+                <el-form-item v-if="form.enableExamine === '1'" label="审批人员" prop="examines" style="width: 100%;" :rules="[{ required: true, message: '请选择审批人员', trigger: 'change' }]">
+                  <ai-user-get :instance="instance" v-model="form.examines" @change="onUserChange">
+                    <div class="AppAnnounceDetail-select">
+                      <el-input class="AppAnnounceDetail-select__input" size="small" placeholder="请选择..." v-model="form.examinesName"></el-input>
+                      <div class="select-left" v-if="form.examines.length">
+                        <span v-for="(item, index) in form.examines" :key="index">
+                          <ai-open-data type="userName" :openid="item.wxOpenUserId"></ai-open-data>
+                        </span>
+                      </div>
+                      <i v-if="!form.examines.length">请选择</i>
+                        <div class="select-right">{{ form.examines.length ? '重新选择' : '选择' }}</div>
                     </div>
-                    <i v-if="!form.examines.length">请选择</i>
-                    <ai-user-get :instance="instance" v-model="form.examines" @change="onUserChange">
-                      <div class="select-right">{{ form.examines.length ? '重新选择' : '选择' }}</div>
-                    </ai-user-get>
-                  </div>
+                  </ai-user-get>
                 </el-form-item>
               </div>
             </template>
@@ -817,8 +815,15 @@ export default {
       min-height: 32px;
       line-height: 1;
       background: #F5F5F5;
-      border-radius: 2px;
+      border-radius: 4px;
       border: 1px solid #D0D4DC;
+      cursor: pointer;
+      overflow: hidden;
+      transition: border-color 0.2s cubic-bezier(0.645, 0.045, 0.355, 1);
+
+      &:hover {
+        border-color: #26f;
+      }
 
       & > i {
         flex: 1;
@@ -860,6 +865,7 @@ export default {
         flex: 1;
         padding: 5px 0 0px 12px;
         border-right: 1px solid #D0D4DC;
+        border-radius: 4px 0 0 4px;
         background: #fff;
 
         em {