Merge branch 'feature/十月迭代' into dev

dist/static/css/public.css

@@ -396,6 +396,9 @@ input:focus {
 .color-2f54eb {
     color: #2F54EB;
 }
+.color-33af4a{
+    color: #33AF4A;
+}
 .color-dedfe6 {
     color: #dedfe6;
 }

src/components/company/new-depart-member.vue

@@ -22,7 +22,7 @@
       <div class="depart-condition-wrap flex flex-space-between ">
         <div class="flex">
           <el-input placeholder="请输入姓名/手机号" maxlength="50" v-model="searchInput" class="w-274" @keyup.native="value => toInput(value, searchInput)" clearable @clear="clearInput"></el-input>
-          <el-select v-model="activeFlag" placeholder="所有状态" class="m-l-6" @change="changeStatus"> <el-option v-for="item in statusOptions" :key="item.value" :label="item.label" :value="item.value"> </el-option> </el-select><el-button class="m-l-10 export-btn" style="margin-left: 10px;padding: 7px 12px;" type="primary" @click="exportExcel"><i class="iconfont icon-icon_yunxiazai p-r-6"></i>导出通讯录</el-button>
+          <el-select v-model="relationFlag" placeholder="所有状态" class="m-l-6" @change="changeStatus"> <el-option v-for="item in statusOptions" :key="item.value" :label="item.label" :value="item.value"> </el-option> </el-select><el-button class="m-l-10 export-btn" style="margin-left: 10px;padding: 7px 12px;" type="primary" @click="exportExcel"><i class="iconfont icon-icon_yunxiazai p-r-6"></i>导出通讯录</el-button>
           <el-tooltip content="如需获取最新通讯录，请刷新企业成功后，再进行导出。" placement="top">
             <!-- <button type="button" class="el-button el-button--text" style="margin-left: 10px;"><span class="font-12" style="border-bottom: 1px dashed #2F54EB;">导出提示</span></button> -->
             <i class="el-icon-info" style="margin-top:10px;margin-left:10px;color:#909399;"></i>
@@ -51,13 +51,14 @@
             <template #header>
               <el-tooltip class="item" effect="dark" placement="right">
                 <div slot="content">
-                  是否使用好办3.0小程序
+                  该企业员工是否关联好办导航账号
                 </div>
                 <span style="cursor: pointer;padding-bottom: 2px; border-bottom: 1px dashed #2F54EB;">使用状态</span>
               </el-tooltip>
             </template>
             <template slot-scope="scope">
-              <span :class="['inline-block iconfont iconhuaban', scope.row.activeFlag == 1 ? 'color-2f54eb' : 'color-c0c4cc']"></span>
+              <span :style="scope.row.relationFlag == 1 ? 'background: #33AF4A' : 'background:#c0c4cc'" class="point"></span>
+              {{ scope.row.relationFlag == 1 ? '已关联' : '未关联' }}
             </template>
           </el-table-column>
           <el-table-column prop="" label="关联详情" show-overflow-tooltip>
@@ -124,7 +125,7 @@ export default {
   data() {
     return {
       searchInput: '',
-      activeFlag: '',
+      relationFlag: '',
       statusOptions: [
         {
           value: '',
@@ -164,7 +165,7 @@ export default {
      * 导出
      */
     exportExcel: _debounce(function() {
-      window.open(`/haoban-manage3-web/staff-export?departmentId=${this.departObj.departmentId}&activeFlag=${this.activeFlag}&keyWord=${this.searchInput}`);
+      window.open(`/haoban-manage3-web/staff-export?departmentId=${this.departObj.departmentId}&relationFlag=${this.relationFlag}&keyWord=${this.searchInput}`);
     }, 300),
 
     /**
@@ -240,16 +241,6 @@ export default {
       });
     },
     /**
-     * 可选设置
-     **/
-    selectInit(row, index) {
-      if (row.activeFlag == 1) {
-        return false; //不可勾选
-      } else {
-        return true; //可勾选
-      }
-    },
-    /**
      * 选择导购
      */
     changeClerk(e, item) {
@@ -533,7 +524,7 @@ export default {
       }
       let para = {
         departmentId: that.departObj.departmentId,
-        activeFlag: that.activeFlag,
+        relationFlag: that.relationFlag,
         keyWord: that.searchInput || '', // 搜索字段
         pageNum: that.currentPage, // 当前页
         pageSize: that.pageSize // 一页显示个数
@@ -544,7 +535,8 @@ export default {
           that.loading = false;
           if (resData.errorCode == 1) {
             that.tableData = resData.result.result || resData.result.list || [];
-            that.total = resData.result.totalCount || resData.result.total;
+            const { total } = resData.result.pageInfo;
+            that.total = total;
             return false;
           }
           errMsg.errorMsg(resData);