Skip to content

E
ems3.3
Commit 1da60b2f authored by 左玲玲's avatar 左玲玲 😬
Browse files
Options

用户，租赁台账导出二维码

parent e99f0ca3
Hide whitespace changes
Inline Side-by-side
Showing with 78 additions and 83 deletions
src/components/InitForm/FormItems.jsx
View file @ 1da60b2f
......@@ -574,6 +574,7 @@ function LinkSelect({ item, colProps, formRef, name, curindex = 0 }) {
url: curoption?.path,
params: { ...result, ...extraParams },
});
let newOptions = item.showAll ? [{ label: '全部', value: 'all' }, ...(res?.data?.dataList ?? [])] : (res?.data?.dataList ?? []);
if (name) {
let curvals = formRef?.current?.getFieldValue(name);
curvals = curvals.map((it, i) => {
......@@ -587,23 +588,17 @@ function LinkSelect({ item, colProps, formRef, name, curindex = 0 }) {
let curval = formRef?.current?.getFieldValue(curkey),
ifclean;
if (Array.isArray(curval)) {
ifclean = res?.data?.dataList
ifclean = newOptions
?.map((it) => it.value)
.filter?.((it) => {
return curval?.includes(it);
});
} else {
ifclean = res?.data?.dataList.filter((it) => it.value == curval)?.[0]?.value;
ifclean = newOptions.filter((it) => it.value == curval)?.[0]?.value;
}
//console.log(
// curval,
// res?.data?.dataList?.map((it) => it.value),
// curkey,
// );
formRef?.current?.setFieldsValue({ [curkey]: ifclean });
}
return item.showAll ? [{ label: '全部', value: 'all' }, ...(res?.data?.dataList ?? [])] : (res?.data?.dataList ?? []);
return newOptions;
}}
showSearch
/>
......
src/components/InitForm/index.jsx
View file @ 1da60b2f
......@@ -213,7 +213,6 @@ function InitForm(props) {
return it;
});
}
return {
...defaultFormValue,
...(result ?? {}),
......
src/pages/setting/users/columns.js
View file @ 1da60b2f
......@@ -2,11 +2,7 @@ import { doFetch } from '@/utils/doFetch';
import { Image } from 'antd';
import fieldsDetail from '@/utils/fieldsDetail';
import { useState, useEffect } from 'react';
function getcolumns(setDrawer, ifs, formRef) {
// const options = usermsg?.map((it) => ({
// label: `${it?.username}-${it?.fullName}`,
// value: it?.id,
// }));
function getcolumns(setDrawer, ifs, formRef, isLease) {
return [
{
title: '用户名-姓名',
......@@ -217,8 +213,8 @@ function getcolumns(setDrawer, ifs, formRef) {
},
{
title: '用户类型',
dataIndex: 'f1',
key: 'f1',
dataIndex: 'customerTypeName',
key: 'customerType',
formItemProps: {
rules: [
{
......@@ -235,18 +231,21 @@ function getcolumns(setDrawer, ifs, formRef) {
options: [
{
label: '平台用户',
value: '1',
value: 1,
},
{
label: '租户用户',
value: '2',
value: 2,
},
],
hideInForm: isLease == 1 ? false : true,
hideInTable: true,
hideInDescriptions: isLease == 1 ? false : true
},
{
title: '所属客户',
dataIndex: 'f2',
key: 'f2',
dataIndex: 'customerName',
key: 'customerId',
formItemProps: {
rules: [
{
......@@ -259,16 +258,17 @@ function getcolumns(setDrawer, ifs, formRef) {
span: 12,
},
valueType: 'select',
mode: 'radio',
options: {
path: '',
path: '/lease/umLeaseCustomer/getSelection',
params: {},
},
hideInForm: {
f1: {
reverse: ['2'],
customerType: {
reverse: [2],
},
},
hideInTable: true,
hideInDescriptions: isLease == 1 ? false : true
},
{
title: '角色名称',
......@@ -291,7 +291,7 @@ function getcolumns(setDrawer, ifs, formRef) {
searchKey: 'factoryNames',
searchValueType: 'input',
options: { path: '/auth/sysFactory/getAllFactorySelection', params: {} },
showAll: true,
showAll: true
},
{
title: '负责车间',
......
src/pages/setting/users/index.jsx
View file @ 1da60b2f
......@@ -20,8 +20,9 @@ import { useRequest } from 'ahooks';
import { indexOf } from 'lodash';
function User(props) {
const { initialState, loading, error, refresh, setInitialState } = useModel('@@initialState');
const [username, setusername] = useState(null);
const { initialState: { currentUser }, loading, error, refresh, setInitialState } = useModel('@@initialState');
const [username, setusername] = useState(null),
[fieldColumns, cfc] = useState([]);
let actionRef = useRef(),
formRef = useRef();
......@@ -65,46 +66,20 @@ function User(props) {
btn={{
size: 'small',
onClick: () => {
setDrawer((s) => ({
...s,
visible: true,
item: { ...row, usernamefullname: `${row?.username}-${row?.fullName}` },
type: 'edit',
title: '编辑',
val: 'only',
// onFinish: async (vals) => {
// let userCharReqList = [];
// //console.log('id:', row.id);
// for (let i in vals) {
// if (!isNaN(Number(i))) {
// userCharReqList.push({
// fieldId: i,
// fieldRealValue: vals[i],
// });
// delete vals[i];
// }
// }
// let params = {
// ...vals,
// id: row?.id,
// shopIdList: vals.shopId,
// userCharReqList,
// };
// delete params.shopId;
// let res = await doFetch({
// url: urlParams.save,
// params,
// });
// if (res.code === '0000') {
// message.success('编辑成功！');
// setDrawer((s) => ({
// ...s,
// visible: false,
// }));
// actionRef.current.reload();
// }
// },
}));
doFetch({ url: urlParams.detail, params: { id: row.id } }).then(res => {
if (res.code == '0000') {
let data = res?.data?.data ?? {};
setDrawer((s) => ({
...s,
visible: true,
item: { ...data, usernamefullname: `${data?.username}-${data?.fullName}` },
type: 'edit',
title: '编辑',
val: 'only'
}));
}
})
},
}}
>
......@@ -143,24 +118,55 @@ function User(props) {
};
const columns = useMemo(() => {
let defcolumn = getcolumns(setDrawer, false, formRef);
let defcolumn = getcolumns(setDrawer, false, formRef, currentUser?.isLease);
return defcolumn.concat({
title: '操作',
valueType: 'option',
width: 150,
render: (text, row, _, action) => [edit(text, row, _, action), remove(text, row, _, action)],
});
}, []);
}, [currentUser?.isLease]);
useEffect(() => {
if (drawer.type == 'add') {
cfc(getcolumns(setDrawer, false, formRef, currentUser?.isLease))
} else if (drawer.type == 'edit') {
cfc(getcolumns(setDrawer, true, formRef, currentUser?.isLease))
}
}, [drawer.type]);
const valuechange = (changedValues, allValues) => {
for (let i in changedValues) {
if (i == "factoryIdList" || i == 'shopIdList' || i == "sectionIdList" || i == "productionLineIdList") {
let changeFiefls = fieldColumns?.filter(it => it.key == i)?.[0];
let newValindex = changedValues[i]?.indexOf('all'), oldValindex = drawer.item[i]?.indexOf('all') ?? -1, newObj = [];
if (newValindex != -1 && oldValindex == -1 && changedValues[i].length > 1) {
newObj = ['all'];
} else if (newValindex != -1 && oldValindex != -1 && changedValues[i].length > 1) {
newObj = changedValues[i].filter(it => it != 'all');
} else if (newValindex != -1 && oldValindex == -1 && changedValues[i].length == 1) {
newObj = ['all'];
} else {
newObj = changedValues[i]
}
formRef?.current?.setFieldsValue({ [i]: newObj });
setDrawer((s) => {
return {
...s,
item: { ...drawer.item, ...{ [i]: newObj } }
}
});
}
}
}
function selectType(type) {
switch (type) {
case 'add':
return (
<ExtendField
fieldColumns?.length && <ExtendField
setDrawer={setDrawer}
drawer={drawer}
formRef={formRef}
columns={getcolumns(setDrawer, false, formRef)}
columns={fieldColumns}
formId={'1'}
// urlParams={urlParams}
onFinish={async (vals) => {
......@@ -182,7 +188,6 @@ function User(props) {
};
delete params.usernamefullname;
delete params.shopId;
//console.log(params, '!!!!');
let res = await doFetch({
url: urlParams.save,
params,
......@@ -201,23 +206,17 @@ function User(props) {
}
}}
defaultFormValue={drawer.item}
// onValuesChange={(changedValues, allValues) => {
// console.log(changedValues, allValues);
// if (changedValues['username']) {
// console.log(changedValues, allValues);
// }
// }}
onValuesChange={valuechange}
/>
);
case 'edit':
return (
<ExtendField
defaultFormValue={drawer.item}
fieldColumns?.length && <ExtendField
setDrawer={setDrawer}
drawer={drawer}
actionRef={actionRef}
columns={getcolumns(setDrawer, true, formRef)}
columns={fieldColumns}
formId={'1'}
urlParams={urlParams}
onFinish={async (vals) => {
......@@ -239,7 +238,6 @@ function User(props) {
};
delete params.shopId;
delete params.usernamefullname;
//console.log(params, '!!!!');
let res = await doFetch({
url: urlParams.save,
params,
......@@ -257,6 +255,9 @@ function User(props) {
actionRef.current.reload();
}
}}
formRef={formRef}
onValuesChange={valuechange}
defaultFormValue={drawer.item}
/>
);
break;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment