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

packages/bigscreen/dv/components/XyGrid.vue

@@ -38,14 +38,15 @@
         <div class="grid-container">
           <h2 :title="girdName2">{{ girdName2 }}</h2>
           <div class="grid-list">
-            <div
+            <div @click.stop="onGrid2Click(girdId1, girdName2)">{{ girdName2 }}</div>
+            <!-- <div
               :class="[currIndex2 === index ? 'grid-active' : '']"
               v-for="(item, index) in girdInfoList2"
               :key="index"
               :title="item.girdName"
               @click.stop="onGrid2Click(item, index)">
               {{ item.girdName }}
-            </div>
+            </div> -->
           </div>
         </div>
       </div>
@@ -120,6 +121,7 @@
         isShowGrid4: false,
         isShowGrid5: false,
         currIndex2: 0,
+        girdId1: '',
         currIndex3: 0,
         currIndex4: 0,
         currIndex5: 0,
@@ -134,7 +136,8 @@
         girdNum3: 0,
         girdNum4: 0,
         girdNum5: 0,
-        currGird: ''
+        currGird: '',
+        girdName1: ''
       }
     },
 
@@ -159,9 +162,9 @@
         }
       },
 
-      onGrid2Click (item, index) {
-        this.currIndex2 = index
-        this.girdName2 = item.girdName
+      onGrid2Click (id, name) {
+        // this.currIndex2 = index
+        // this.girdName2 = item.girdName
         this.currIndex3 = -1
         this.currIndex4 = -1
         this.currIndex5 = -1
@@ -169,10 +172,10 @@
         this.girdInfoList3 = []
         this.girdInfoList4 = []
         this.girdInfoList5 = []
-        this.$emit('nodeClick', item.id)
+        this.$emit('nodeClick', id)
 
-        this.currGird = item.girdName
-        this.getInfo(item.id)
+        this.currGird = name
+        this.getInfo(id)
       },
 
       onGrid3Click (item, index) {
@@ -234,6 +237,11 @@
             res.data.girdName3 && (this.girdName4 = res.data.girdName3)
             res.data.girdName4 && (this.girdName5 = res.data.girdName4)
 
+            if (this.girdId1) {
+              this.girdName2 = res.data.girdName1
+              this.girdId1 = res.data.girdId1
+            }
+
             res.data.girdNum2 != null && (this.girdNum3 = res.data.girdNum2)
             res.data.girdNum3 != null && (this.girdNum4 = res.data.girdNum3)
             res.data.girdNum4 != null && (this.girdNum5 = res.data.girdNum4)

packages/conv/creditScore/AppGridMemberScore/components/gridScoreManage.vue

@@ -9,13 +9,16 @@
               :props="defaultProps" :show-all-levels="false" @change="gridChange"></el-cascader>
           </template>
           <template #right>
+            <ai-import :instance="instance" :dict="dict" type="appintegraluser" name="积分管理"
+                      @success="getTableData()">
+              <el-button icon="iconfont iconImport">导入</el-button>
+            </ai-import>
+            <ai-download :instance="instance" url="/app/appintegraluser/girdIntegralExport" :params="search" :fileName="menuName"
+                         :disabled="tableData.length == 0">
+            </ai-download>
             <el-input size="small" placeholder="姓名" v-model="search.userName" clearable
               @clear="current = 1, search.userName = '', getTableData()" suffix-icon="iconfont iconSearch"
               v-throttle="() => {(current = 1), getTableData();}"/>
-            <ai-download :instance="instance" url="/app/appintegraluser/girdIntegralExport" :params="search" :fileName="menuName"
-                         :disabled="tableData.length == 0">
-              <el-button size="small">导出</el-button>
-            </ai-download>
           </template>
         </ai-search-bar>
         <ai-table :tableData="tableData" :total="total" :current.sync="current" :size.sync="size"

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

@@ -1,7 +1,7 @@
 <template>
   <ai-detail class="AppAnnounceAdd">
     <template slot="title">
-      <ai-title :title="id ? '编辑居民群发' : '添加居民群发'" isShowBack isShowBottomBorder @onBackClick="cancel(false)">
+      <ai-title :title="id ? '编辑群发居民群' : '添加群发居民群'" isShowBack isShowBottomBorder @onBackClick="cancel(false)">
       </ai-title>
     </template>
     <template slot="content">
@@ -156,7 +156,7 @@
                   </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' }]">
-                  <ai-wechat-selecter :instance="instance" v-model="form.examines" @change="onUserChange">
+                  <ai-user-selecter :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">
@@ -165,7 +165,7 @@
                       <i v-if="!form.examines.length">请选择</i>
                         <div class="select-right">{{ form.examines.length ? '重新选择' : '选择' }}</div>
                     </div>
-                  </ai-wechat-selecter>
+                  </ai-user-selecter>
                 </el-form-item>
               </div>
             </template>

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

@@ -1,7 +1,7 @@
 <template>
   <ai-detail class="AppAnnounceDetail">
     <template slot="title">
-      <ai-title title="群发详情" isShowBack isShowBottomBorder @onBackClick="cancel(false)">
+      <ai-title title="群发居民群详情" isShowBack isShowBottomBorder @onBackClick="cancel(false)">
       </ai-title>
     </template>
     <template slot="content">

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

@@ -33,14 +33,14 @@
             @change="search.current = 1, getList()"
             placeholder="选择群发结束日期">
           </el-date-picker>
-          <ai-wechat-selecter :instance="instance" @change="onUserChange" :isMultiple="false" v-model="user">
+          <ai-user-selecter :instance="instance" @change="onUserChange" :isMultiple="false" v-model="user">
             <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>
             </div>
-          </ai-wechat-selecter>
+          </ai-user-selecter>
         </template>
         <template slot="right">
           <el-input