1130

src/pages/setting/users/columns.js

@@ -19,8 +19,9 @@ function getcolumns(setdrawer) {
       render: (text, row) => {
         return (
           <a
-            onClick={() => {
-              const [fieldscolumns, setfieldscolumns] = useState([
+            onClick={async () => {
+              let newfieldscolumns = [];
+              const fieldscolumns = [
                 {
                   title: '用户名',
                   dataIndex: 'username',
@@ -31,15 +32,58 @@ function getcolumns(setdrawer) {
                   dataIndex: 'fullName',
                   key: 'fullName',
                 },
-                { title: '手机号', hideInTable: true, dataIndex: 'telephone', key: 'telephone' },
+                { title: '手机号', dataIndex: 'telephone', key: 'telephone' },
                 {
                   title: '邮箱',
                   dataIndex: 'mailNo',
                   key: 'mailNo',
-                  hideInTable: true,
-                  search: false,
                 },
-              ]);
+                {
+                  title: '公司名称',
+                  dataIndex: 'organizationName',
+                  key: 'organizationId',
+                },
+                {
+                  title: '部门名称',
+                  dataIndex: 'departmentName',
+                  key: 'departmentId',
+                },
+                {
+                  title: '负责工厂',
+                  dataIndex: 'factoryNames',
+                  key: 'factoryNames',
+                },
+                {
+                  title: '负责车间',
+                  dataIndex: 'shopNames',
+                  key: 'shopNames',
+                },
+                {
+                  title: '负责工段',
+                  dataIndex: 'sectionName',
+                  key: 'sectionIdList',
+                },
+                {
+                  title: '负责产线',
+                  dataIndex: 'productionLines',
+                  key: 'productionLineIdList',
+                },
+                {
+                  title: '角色配置',
+                  dataIndex: 'roleNames',
+                  key: 'roleIdList',
+                },
+                {
+                  title: '直属领导',
+                  dataIndex: 'parentName',
+                  key: 'parentId',
+                },
+                {
+                  title: '状态',
+                  dataIndex: 'statusName',
+                  key: 'status',
+                },
+              ];
               const selectValueType = (type, options) => {
                 switch (type) {
                   case 1:
@@ -66,40 +110,36 @@ function getcolumns(setdrawer) {
                 }
               };
 
-              useEffect(() => {
-                const fn = async () => {
-                  let res = await doFetch({
-                    url: '/base/paFormField/queryList',
-                    params: {
-                      formId: '1',
-                    },
+              let res = await doFetch({
+                url: '/base/paFormField/queryList',
+                params: {
+                  formId: '1',
+                },
+              });
+              if (res?.data?.dataList) {
+                let column = [
+                  {
+                    title: '扩展字段',
+                    valueType: 'split',
+                  },
+                ];
+                res?.data?.dataList?.forEach((el) => {
+                  column.push({
+                    ...selectValueType(el.fieldChar, el.valueList),
+                    title: el.fieldName,
+                    dataIndex: el.id,
+                    key: el.id,
                   });
-                  if (res?.data?.dataList) {
-                    let column = [
-                      {
-                        title: '扩展字段',
-                        valueType: 'split',
-                      },
-                    ];
-                    res?.data?.dataList?.forEach((el) => {
-                      column.push({
-                        ...selectValueType(el.fieldChar, el.valueList),
-                        title: el.fieldName,
-                        dataIndex: el.fieldName,
-                        key: el.id,
-                      });
-                    });
-                    setfieldscolumns(fieldscolumns.concat(column));
-                  }
-                };
-                fn();
-              }, []);
+                });
+                newfieldscolumns = fieldscolumns.concat(column);
+                console.log('fieldscolumns', newfieldscolumns);
+              }
               setdrawer((s) => ({
                 ...s,
                 visible: true,
                 item: row,
                 title: '详情',
-                fields: fieldscolumns,
+                fields: newfieldscolumns,
                 extendField: 'userCharList',
                 detailpath: '/auth/sysUser/detail',
                 params: { id: row.id },