fangmingyue 2 年之前
父節點
當前提交
08d992aede
共有 5 個檔案被更改,包括 5 行新增137 行删除
  1. 0
    130
      src/pages/custom/Account.jsx
  2. 1
    1
      src/pages/custom/index.jsx
  3. 3
    4
      src/pages/project/index.jsx
  4. 0
    1
      src/pages/user/index.jsx
  5. 1
    1
      src/utils/request.js

+ 0
- 130
src/pages/custom/Account.jsx 查看文件

@@ -1,130 +0,0 @@
1
-import React from "react";
2
-import { Modal, Form, Input, Button, Select } from "antd";
3
-import useBool from "@/utils/hooks/useBool";
4
-import { getSysLogin, postSysLogin } from "@/services/syslogin";
5
-import { postSysUser, getSysUserById } from "@/services/sysuser";
6
-import md5 from "md5";
7
-
8
-const { Option } = Select;
9
-
10
-const formItemLayout = {
11
-  labelCol: {
12
-    xs: { span: 24 },
13
-    sm: { span: 8 },
14
-  },
15
-  wrapperCol: {
16
-    xs: { span: 24 },
17
-    sm: { span: 16 },
18
-  },
19
-};
20
-const tailFormItemLayout = {
21
-  wrapperCol: {
22
-    xs: {
23
-      span: 24,
24
-      offset: 0,
25
-    },
26
-    sm: {
27
-      span: 16,
28
-      offset: 8,
29
-    },
30
-  },
31
-};
32
-
33
-const defaultPass = "123456";
34
-
35
-export default (props) => {
36
-  const { user, onSuccess, onCancel, roleList = [], ...leftProps } = props;
37
-
38
-  const [loading, startLoading, cancelLoading] = useBool();
39
-  const [form] = Form.useForm();
40
-
41
-  const onFinish = (values) => {
42
-    const password = md5(defaultPass);
43
-    const rolesList = (values.rolesList || []).map((x) => ({ roleId: x }));
44
-    const data = {
45
-      ...user,
46
-      ...values,
47
-      password,
48
-
49
-      rolesList,
50
-      userId: user.userId,
51
-    };
52
-
53
-    startLoading();
54
-    postSysUser(data)
55
-      .then((res) => {
56
-        onSuccess();
57
-        cancelLoading();
58
-      })
59
-      .catch(() => {
60
-        cancelLoading();
61
-      });
62
-  };
63
-
64
-  React.useEffect(() => {
65
-    if (user?.userId) {
66
-      form.setFieldsValue({
67
-        account: user.account || undefined,
68
-        rolesList: user.rolesList.map((x) => x.roleId),
69
-      });
70
-    }
71
-  }, [user, form]);
72
-
73
-  return (
74
-    <Modal
75
-      title="账号维护"
76
-      footer={null}
77
-      width={600}
78
-      onCancel={onCancel}
79
-      {...leftProps}
80
-    >
81
-      <Form
82
-        {...formItemLayout}
83
-        form={form}
84
-        scrollToFirstError
85
-        style={{ width: "480px" }}
86
-        onFinish={onFinish}
87
-      >
88
-        <Form.Item
89
-          name="account"
90
-          label="账号"
91
-          rules={[
92
-            {
93
-              required: true,
94
-              message: "请填写姓名",
95
-            },
96
-          ]}
97
-        >
98
-          <Input />
99
-        </Form.Item>
100
-        <Form.Item name="rolesList" label="角色">
101
-          <Select
102
-            mode="multiple"
103
-            allowClear
104
-            style={{ width: "100%" }}
105
-            placeholder="请选择角色"
106
-          >
107
-            {roleList.map((role) => (
108
-              <Option key={role.roleId}>{role.name}</Option>
109
-            ))}
110
-          </Select>
111
-        </Form.Item>
112
-        <Form.Item
113
-          // name="password"
114
-          label="密码"
115
-          // help={`默认密码 ${defaultPass}`}
116
-        >
117
-          <div>{`默认密码 ${defaultPass}`}</div>
118
-        </Form.Item>
119
-        <Form.Item {...tailFormItemLayout}>
120
-          <Button loading={loading} type="primary" htmlType="submit">
121
-            保存
122
-          </Button>
123
-          <Button style={{ marginLeft: "2em" }} onClick={onCancel}>
124
-            取消
125
-          </Button>
126
-        </Form.Item>
127
-      </Form>
128
-    </Modal>
129
-  );
130
-};

+ 1
- 1
src/pages/custom/index.jsx 查看文件

@@ -25,6 +25,7 @@ export default (props) => {
25 25
     {
26 26
       title: "公司",
27 27
       dataIndex: "customName",
28
+      search: false,
28 29
     },
29 30
     {
30 31
       title: "税号",
@@ -53,7 +54,6 @@ export default (props) => {
53 54
     {
54 55
       title: "联系人手机",
55 56
       dataIndex: "contactsPhone",
56
-      search: false,
57 57
     },
58 58
     {
59 59
       title: "联系人邮箱",

+ 3
- 4
src/pages/project/index.jsx 查看文件

@@ -67,6 +67,7 @@ export default (props) => {
67 67
     {
68 68
       title: "联系人手机",
69 69
       dataIndex: "contactsPhone",
70
+      search: false,
70 71
     },
71 72
     {
72 73
       title: "联系人邮箱",
@@ -76,7 +77,6 @@ export default (props) => {
76 77
     {
77 78
       title: "负责人",
78 79
       dataIndex: "headPerson",
79
-      search: false,
80 80
     },
81 81
     {
82 82
       title: "服务运营商",
@@ -142,9 +142,8 @@ export default (props) => {
142 142
       onDelete={onDelete}
143 143
       onEdit={onEdit}
144 144
       request={getTaProject}
145
-      columnOptionRender={(_, res) => [
146
-        // console.log('res', res.webUrl),
147
-        <Button key={1} style={{ padding: 0 }} type="link" href={res.webUrl}>
145
+      columnOptionRender={(_, res, index) => [
146
+        <Button key={res.projectId} style={{ padding: 0 }} type="link" href={res.webUrl}>
148 147
           跳转
149 148
         </Button>
150 149
       ]}

+ 0
- 1
src/pages/user/index.jsx 查看文件

@@ -26,7 +26,6 @@ export default (props) => {
26 26
     {
27 27
       title: "电话",
28 28
       dataIndex: "phone",
29
-      search: false,
30 29
     },
31 30
     {
32 31
       title: "操作",

+ 1
- 1
src/utils/request.js 查看文件

@@ -22,7 +22,7 @@ instance.interceptors.request.use(
22 22
     } = config;
23 23
     let token = localStorage.getItem("token") || "";
24 24
     const tokenB = (`Bearer ${token}`);
25
-    console.log('----tokenB---->', tokenB);
25
+    // console.log('----tokenB---->', tokenB);
26 26
 
27 27
     let noTip = silent;
28 28
     if (noTip === undefined) {