客户，组织架构调试

linkwe-ui/src/api/customer/dimission.js

@@ -5,12 +5,32 @@ const service = config.services.wecom + '/user'
  * 获取离职未分配员工列表
  * @param {*} params 
  * {
- * pageNum:
+pageNum:
 pageSize:
-userName:离职人员名称
-beginTime:}
+beginTime:
+endTime:
+userName:
+}
  */
 export function getList(params) {
+  return request({
+    url: service + '/leaveUserAllocateList',
+    params
+  })
+}
+
+/**
+ * 获取离职已分配员工列表
+ * @param {*} params 
+ * {
+pageNum:
+pageSize:
+beginTime:
+endTime:
+userName:
+}
+ */
+export function getListNo(params) {
   return request({
     url: service + '/leaveUserNoAllocateList',
     params

linkwe-ui/src/api/customer/group.js

@@ -35,3 +35,13 @@ export function getMembers(params) {
     params
   })
 }
+
+
+/**
+ * 客户群同步接口
+ */
+export function sync() {
+  return request({
+    url: service + '/chat/synchWeGroup',
+  })
+}

linkwe-ui/src/views/contacts/organization.vue

@@ -11,7 +11,7 @@ export default {
         pageNum: 1,
         pageSize: 10,
         isActivate: "",
-        department: "1",
+        department: "",
       },
       dateRange: [],
       treeData: [],
@@ -31,7 +31,7 @@ export default {
       total: 0,
       defaultProps: {
         label: "name",
-        childr启用en: "children",
+        children: "children",
       },
       form: {},
       dialogVisible: false,

linkwe-ui/src/views/customerManage/customer.vue

@@ -172,7 +172,7 @@ export default {
       });
       api.sync().then(() => {
         loading.close();
-        this.msgSuccess("操作成功");
+        this.msgSuccess("后台开始同步数据，请稍后关注进度");
       });
     },
     selectedUser(list) {

linkwe-ui/src/views/customerManage/customerDetail.vue

@@ -43,7 +43,7 @@ export default {
         </div>
         <div class="info">
           出生日期：{{customer.birthday || '--'}}
-          <div class="ml20" style="position: absolute;">
+          <div class="bfc-d ml20">
             <el-date-picker
               v-if="datePickerVisible"
               v-model="customer.birthday"
@@ -87,7 +87,7 @@ export default {
         </el-row>
         <el-row :gutter="10">
           <el-col :span="10">所在部门：</el-col>
-          <el-col :span="12">{{"--"}}</el-col>
+          <el-col :span="12">{{customer.weFlowerCustomerRels[0].department}}</el-col>
         </el-row>
         <el-row :gutter="10">
           <el-col :span="10">添加时间：</el-col>

linkwe-ui/src/views/customerManage/dimission.vue

@@ -39,7 +39,7 @@ export default {
       page && (this.query.pageNum = page);
       this.loading = true;
       api
-        .getList(this.query)
+        .getListNo(this.query)
         .then(({ rows, total }) => {
           this.list = rows;
           this.total = +total;
@@ -111,6 +111,7 @@ export default {
           v-hasPermi="['customerManage:dimission:filter']"
           type="primary"
           size="mini"
+          @click="getList(1)"
         >已分配的离职员工</el-button>
         <el-button
           v-hasPermi="['customerManage:dimission:allocate']"

linkwe-ui/src/views/customerManage/group.vue

@@ -65,6 +65,18 @@ export default {
       this.dateRange = [];
       this.$refs["queryForm"].resetFields();
     },
+    sync() {
+      const loading = this.$loading({
+        lock: true,
+        text: "Loading",
+        spinner: "el-icon-loading",
+        background: "rgba(0, 0, 0, 0.7)",
+      });
+      api.sync().then((r) => {
+        loading.close();
+        this.msgSuccess("后台开始同步数据，请稍后关注进度");
+      });
+    },
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map((item) => item.id);
@@ -166,11 +178,12 @@ export default {
 
     <div class="mid-action">
       <div class="total">
-        己选
-        <span class="num">{{total}}</span> 个客户群
+        <!-- 己选
+        <span class="num">{{total}}</span> 个客户群-->
         <span>
-          最近更新：2020-08-25 06:35:00，同步
-          <span class="num">{{total}}</span> 条信息 ，共
+          <!-- 最近更新：2020-08-25 06:35:00，同步
+          <span class="num">{{total}}</span> 条信息 ，-->
+          共
           <span class="num">{{total}}</span> 个客户群
         </span>
       </div>
@@ -180,6 +193,7 @@ export default {
           type="primary"
           size="mini"
           icon="el-icon-refresh"
+          @click="sync"
         >同步客户群</el-button>
       </div>
     </div>
@@ -188,7 +202,7 @@ export default {
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="群名" align="center" prop="groupName" />
       <el-table-column label="群人数" align="center" prop="memberNum" />
-      <el-table-column label="群主" align="center" prop="groupLeader" />
+      <el-table-column label="群主" align="center" prop="groupLeaderName" />
       <el-table-column label="创建时间" align="center" prop="createTime" width="180"></el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">

linkwe-ui/src/views/customerManage/groupDetail.vue

@@ -34,6 +34,11 @@ export default {
         groupId: undefined,
         memberName: undefined,
       },
+      joinScene: {
+        1: "由成员邀请入群（直接邀请入群）",
+        2: "由成员邀请入群（通过邀请链接入群）",
+        3: "通过扫描群二维码入群",
+      },
     };
   },
   created() {
@@ -130,14 +135,14 @@ export default {
         <div style="margin-bottom: 20px;">{{group.groupName}}</div>
         <div
           class="info"
-        >群主：{{group.groupLeader}} | 创建时间：{{group.createTime}} | 群公告：{{group.notice || '未设置'}}</div>
+        >群主：{{group.groupLeaderName}} | 创建时间：{{group.createTime}} | 群公告：{{group.notice || '未设置'}}</div>
       </div>
     </div>
     <el-input placeholder="请输入群成员" v-model="query.memberName" class>
       <el-button slot="append" @click="getList(1)">查询</el-button>
     </el-input>
     <el-table v-loading="loading" :data="list" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
+      <!-- <el-table-column type="selection" width="55" align="center" /> -->
       <el-table-column label="群成员" align="center" prop="operId">
         <template slot-scope="scope">
           {{ scope.row.memberName }}
@@ -147,12 +152,12 @@ export default {
           <!-- <i :class="['el-icon-s-custom', ({1: 'man', 2: 'woman'})[scope.row.gender]]"></i> -->
         </template>
       </el-table-column>
-      <el-table-column label="进群时间" align="center" prop="joinTime" width="180">
+      <el-table-column label="进群时间" align="center" prop="joinTime" width="180"></el-table-column>
+      <el-table-column label="进群方式" align="center" prop="joinScene">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.joinTime) }}</span>
+          <span>{{ joinScene[scope.row.joinScene] }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="进群方式" align="center" prop="joinType" />
     </el-table>
 
     <pagination
@@ -160,7 +165,7 @@ export default {
       :total="total"
       :page.sync="query.pageNum"
       :limit.sync="query.pageSize"
-      @pagination="getList"
+      @pagination="getList()"
     />
   </div>
 </template>