fix:解决合并dev冲突

8e50a3fb · guomingpang · 4f7b835a · 0631b93b · 8e50a3fb · 8e50a3fb
Commit 8e50a3fb authored Aug 14, 2021 by guomingpang
8 changed files
--- a/src/modules/college-manage/EmployeeManage.tsx
+++ b/src/modules/college-manage/EmployeeManage.tsx
@@ -146,6 +146,7 @@ function EmployeeManage() {
      {
        title: "员工",
        dataIndex: "weChatAccount",
+        fixed:'left',
        render: (val: string, record: RecordTypes) => {
          return (
            <div className="employee-info">
@@ -204,6 +205,7 @@ function EmployeeManage() {
      {
        title: "操作",
        dataIndex: "operation",
+        fixed:'right',
        render: (val: string, record: RecordTypes) => {
          return record.role === "学院管理员" ||
            record.userId === User.getUserId() ? (
@@ -474,23 +476,24 @@ function EmployeeManage() {
                  添加员工
                </Button>
                <Button className="update-user-btn" onClick={()=>{updateListData()}}>更新列表数据</Button>
-                <span className="origin-text">数据来源企业微信通讯录</span>
+                <span className="origin-text">系统实时同步企业微信可见范围的员工信息，如需修改请前往企微管理后台通讯录中操作</span>
                <a
                  href="https://www.yuque.com/docs/share/8c66333f-ed62-469d-909e-b36389a115ea?#"
                  target="_blank"
                >
-                  <span className="view-text">查看数据更新说明</span>
+                  <span className="view-text">查看说明</span>
                </a>
               </>
            }
          </div>
-        <LimitTip type="员工" total={realTotal} tip={() => { return (<div>数据为当前学院的员工数，若员工存在多个学院，企业人数只统计为1人</div>) }} />
+          <LimitTip type="员工" total={realTotal} tip={()=>{return (<div>数据为当前学院的员工数，若员工存在多个学院，企业人数只统计为1人</div>)}}/>
          <div className="box-body">
          <XMTable 
              renderEmpty={{
                image: college,
                description: '暂无数据'
              }}
+              scroll={{ x: 1200 }}
              size={"middle"}
              pagination={false}
              dataSource={employeeList}

--- a/src/modules/college-manage/UserManagePage.tsx
+++ b/src/modules/college-manage/UserManagePage.tsx
 /*
 * @Author: wufan
 * @Date: 2020-11-30 10:47:38
- * @LastEditors: wufan
+ * @LastEditors: Please set LastEditors
- * @LastEditTime: 2021-06-21 11:13:15
+ * @LastEditTime: 2021-08-13 16:52:16
 * @Description: 学员管理页面
 * @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
 */

--- a/src/modules/college-manage/WechatUserAudit/WechatUserAuditFilter.jsx
+++ b/src/modules/college-manage/WechatUserAudit/WechatUserAuditFilter.jsx
@@ -15,8 +15,8 @@ const { Search } = Input;
 const defaultQuery = {
  realName: null,
-  startTime: null,
+  startDate: null,
-  endTime: null,
+  endDate: null,
 };
 const WechatUserAuditFilter = function (props) {
@@ -42,11 +42,11 @@ const WechatUserAuditFilter = function (props) {
    };
    if (_.isEmpty(dates)) {
-      delete _query.startTime;
+      delete _query.startDate;
-      delete _query.endTime;
+      delete _query.endDate;
    } else {
-      _query.startTime = dates[0]?.startOf('day').valueOf();
+      _query.startDate = dates[0]?.startOf('day').valueOf();
-      _query.endTime = dates[1]?.endOf('day').valueOf();
+      _query.endDate = dates[1]?.endOf('day').valueOf();
    }
    setQuery(_query);
    onChange(_query);
@@ -87,7 +87,7 @@ const WechatUserAuditFilter = function (props) {
            <RangePicker
              id='course_date_picker'
              allowClear={false}
-              value={query.startTime ? [moment(query.startTime), moment(query.endTime)] : null}
+              value={query.startDate ? [moment(query.startDate), moment(query.endDate)] : null}
              format={'YYYY-MM-DD'}
              onChange={(dates) => {
                handleChangeDates(dates);

--- a/src/modules/college-manage/components/DepartMentTabCon.jsx
+++ b/src/modules/college-manage/components/DepartMentTabCon.jsx
@@ -8,6 +8,7 @@ import college from "@/common/lottie/college.json";
 import WWOpenDataCom from '@/components/WWOpenDataCom';
 import StoreService from "@/domains/store-domain/storeService";
 import { DepType } from "@/domains/store-domain/constants";
+import Platform from '@/common/js/platform';
 import User from "@/common/js/user";
 import moment from "moment";
 import "./DepartMentTabCon.less";
@@ -31,11 +32,13 @@ function DepartMentTabCon(props) {
  useEffect(()=>{
    setSelectUser([]);
  },[selectDep]);
  const columns = [
    {
      title: "学员",
      dataIndex: "nickName",
      width: 220,
+      fixed:!Platform.isWorkWx(),
      render: (val, item) => {
        return (
          <div>
@@ -59,7 +62,6 @@ function DepartMentTabCon(props) {
    {
      title: "真实姓名",
      dataIndex: "realName",
-      width: 180,
      render: (val, record) => {
        return <span>{val}</span>
      },
@@ -123,7 +125,7 @@ function DepartMentTabCon(props) {
        return (
          <div className="operate">
            {props.currentTab==='departMentTab'?
-              <span>-</span>
+               <div className="operate__item" onClick={()=>delUser('single',item.userId)}>删除</div>
              :
              (selectDep.depLevel > 0 ?
               <div className="operate__item" onClick={()=>delUser('single',item.userId)}>移出</div>
@@ -350,20 +352,24 @@ function DepartMentTabCon(props) {
                添加学员
              </Button>
            }
-            {(props.currentTab === "postGrouptab" || props.currentTab === "customGroupTab") &&
              <Button className="del-user-btn" onClick={()=>delUser('multiple')}>删除学员</Button>
-            }
-            { selectDep.depId !== '10000' &&
+            { selectDep.depId !== '10000' ?
              <>
                <Button className="update-user-btn" onClick={()=>{updateListData()}}>更新列表数据</Button>
-                <span className="origin-text">数据来源企业微信通讯录</span>
+                <div style={{marginTop:'12px'}}>
+                  <span className="origin-text">系统实时同步企业微信可见范围的学员信息，如需修改请前往企微管理后台通讯录中操作</span>
                  <a
                    href="https://www.yuque.com/docs/share/8c66333f-ed62-469d-909e-b36389a115ea?#"
                    target="_blank"
                  >
-                  <span className="view-text">查看数据更新说明</span>
+                    <span className="view-text">查看说明</span>
                  </a>
+                </div>
              </>
+              :
+              <span className="origin-text">微信学员通过授权或扫码登录后，数据自动同步到系统。</span>
            }
          </div>
        )}
@@ -423,6 +429,7 @@ function DepartMentTabCon(props) {
              },
            }}
          />
+          {total > 0 &&
            <div className="box-footer">
              <PageControl
                current={query.current - 1}
@@ -436,6 +443,7 @@ function DepartMentTabCon(props) {
                }}
              />
            </div>
+          }
        </div>
      </div>
      {chooseMembersModalVisible && (

--- a/src/modules/college-manage/components/LeftStructureTree.jsx
+++ b/src/modules/college-manage/components/LeftStructureTree.jsx
@@ -503,7 +503,7 @@ function LeftStructureTree(props) {
  function selectUserList(record, e) {
    const _selectKeys = [];
-    if(e.selectedNodes){
+    if(e.selectedNodes && e.selectedNodes.length>0){
      _selectKeys.push(e.selectedNodes[0].id)
    }
    setSelectedKeys(_selectKeys);

--- a/src/modules/college-manage/components/LeftStructureTree.less
+++ b/src/modules/college-manage/components/LeftStructureTree.less
@@ -100,6 +100,9 @@
        text-align:right;
      }
    }
+    .ant-select-item-option-grouped{
+      padding-left:12px;
+    }
    .empty-con{
      text-align:center;
      .empty-img{

--- a/src/modules/college-manage/components/SearchUser.less
+++ b/src/modules/college-manage/components/SearchUser.less
@@ -36,6 +36,7 @@
                    }
                    .departmentName{
                        display: inline-block;
+                        vertical-align: middle;
                        max-width:190px;
                        overflow: hidden;
                        white-space: nowrap;

--- a/src/modules/teach-tool/question-manage/components/QuestionList.jsx
+++ b/src/modules/teach-tool/question-manage/components/QuestionList.jsx
 /*
 * @Author: yuananting
 * @Date: 2021-02-25 11:23:47
- * @LastEditors: fusanqiasng
+ * @LastEditors: Please set LastEditors
- * @LastEditTime: 2021-06-15 14:41:18
+ * @LastEditTime: 2021-08-13 17:05:37
 * @Description: 助学工具-题库-题目列表数据
 * @Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
 */