zcloud_gbs
/
zcloud_gbs_basic_info_gwj-react
13
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改身份证加密后判重问题

dev
853931625@qq.com 2025-12-25 13:35:50 +08:00
parent c61b34df0d
commit a4a9488978
17 changed files with 61 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
jjb.config.js
View File

@ -11,6 +11,7 @@ module.exports = {
// 接口服务地址
API_HOST: "http://192.168.20.100:30140",
// API_HOST: "https://gbs-gateway.qhdsafety.com",
},
production: {
// 应用后端分支名称，部署上线需要
@ -26,8 +27,8 @@ module.exports = {
contextInject: {
// 应用Key
appKey: "",
fileUrl: "http://192.168.20.240:9787/mnt/",
// fileUrl: "https://jpfz.qhdsafety.com/gbsFileTest/",
// fileUrl: "http://192.168.20.240:9787/mnt/",
fileUrl: "https://jpfz.qhdsafety.com/gbsFileTest/",
},
// public/index.html注入全局变量
windowInject: {
@ -42,9 +43,7 @@ module.exports = {
},
},
// 注入js链接集合
scripts: [
"https://api.map.baidu.com/api?v=1.0&type=webgl&ak=OElqFYoKiAH8KFtph8ftLKF5NlNrbCUr",
],
scripts: [],
},
// 开发服务
server: {

4
src/pages/Container/Enterprise/EnterpriseMiddleground/ChangeView/index.js
View File

@ -13,10 +13,9 @@ function ChangeView(props) {
useEffect(() => {
props["getChangerRecordInfoById"]({ corpinfoId: queryParams["corpinfoId"], userId: queryParams["id"] }).then((res) => {
if(res.data){
if (res.data) {
setInfo(res.data);
}
});
}, []);
@ -140,6 +139,7 @@ function ChangeView(props) {
/>
<Divider orientation="left">{queryParams["type"] === "disposal" ? "未完成工作" : "工作交接"}</Divider>
<Table
pagination={false}
columns={[
{
title: "工作项目",

4
src/pages/Container/Enterprise/EnterpriseMiddleground/List/index.js
View File

@ -42,6 +42,8 @@ function List(props) {
const key = selectedKeys[0] || null;
setSelectedNodeId(key);
getData();
};
return (
<div>
@ -57,7 +59,7 @@ function List(props) {
borderRight: "10px solid #f1f1f2",
paddingRight: "10px",
marginRight: "10px",
height: "100vh",
height: "calc(100dvh - 112px)",
}}
>
<LeftTree onSelect={onTreeChange} />

2
src/pages/Container/Enterprise/OrganizationStructure/index.js
View File

@ -108,7 +108,7 @@ function OrganizationStructure(props) {
borderRight: "10px solid #f1f1f2",
paddingRight: "10px",
marginRight: "10px",
height: "100vh",
height: "calc(100dvh - 112px)",
}}
>
<LeftTree key={treeKey} onGetNodePaths={onGetNodePaths} />

2
src/pages/Container/Enterprise/Post/index.js
View File

@ -69,7 +69,7 @@ function Post(props) {
borderRight: "10px solid #f1f1f2",
paddingRight: "10px",
marginRight: "10px",
height: "100vh",
height: "calc(100dvh - 112px)",
}}
>
<LeftTree onSelect={onTreeChange} />

2
src/pages/Container/Enterprise/User/Add/index.js
View File

@ -179,7 +179,7 @@ function Add(props) {
return;
}
props["verifyUser"]({
userIdCard: debouncedUserIdCard,
userIdCard: btoa(debouncedUserIdCard),
id: queryParams["id"] ?? "",
}).then((res) => {
if (!res.success) {

10
src/pages/Container/Enterprise/User/List/index.js
View File

@ -40,6 +40,7 @@ function List(props) {
const { downloadBlob } = useDownloadBlob();
const [selectedRowKeys, setSelectedRowKeys] = useState([]);
const { importFile } = useImportFile();
const [treeKey, setTreeKey] = useState(0);
const { tableProps, getData } = useTable(props["userList"], {
form,
transform: (formData) => {
@ -105,6 +106,7 @@ function List(props) {
if (res.success) {
message.success("导入成功");
getData();
setTreeKey(prev => prev + 1);
}
});
};
@ -125,10 +127,10 @@ function List(props) {
borderRight: "10px solid #f1f1f2",
paddingRight: "10px",
marginRight: "10px",
height: "100vh",
height: "calc(100dvh - 112px)",
}}
>
<LeftTree onSelect={onTreeChange} />
<LeftTree onSelect={onTreeChange} key={treeKey} />
</div>
<div style={{ flex: 1, display: "flex", flexDirection: "column", minHeight: 0, padding: "20px 0" }}>
@ -211,11 +213,11 @@ function List(props) {
dataIndex: "name",
},
{
title: "部门",
title: "所属部门",
dataIndex: "departmentName",
},
{
title: "岗位",
title: "所属岗位",
dataIndex: "postName",
},
// {

2
src/pages/Container/Stakeholder/Department/index.js
View File

@ -123,7 +123,7 @@ function Department(props) {
borderRight: "10px solid #f1f1f2",
paddingRight: "10px",
marginRight: "10px",
height: "100vh",
height: "calc(100dvh - 112px)",
}}
>
<LeftTree key={treeKey} onGetNodePaths={onGetNodePaths} />

2
src/pages/Container/Stakeholder/User/Add/index.js
View File

@ -190,7 +190,7 @@ function Add(props) {
return;
}
props["verifyUser"]({
userIdCard: debouncedUserIdCard,
userIdCard: btoa(debouncedUserIdCard),
id: queryParams["id"] ?? "",
}).then((res) => {
if (!res.success) {

13
src/pages/Container/Stakeholder/User/List/index.js
View File

@ -91,7 +91,7 @@ function List(props) {
borderRight: "10px solid #f1f1f2",
paddingRight: "10px",
marginRight: "10px",
height: "100vh",
height: "calc(100dvh - 112px)",
}}
>
<LeftTree onSelect={onTreeChange} />
@ -105,10 +105,10 @@ function List(props) {
name: "likeName",
label: "姓名",
},
{
name: "likeUserIdCard",
label: "身份证号",
},
// {
// name: "likeUserIdCard",
// label: "身份证号",
// },
]}
onFinish={getData}
@ -165,6 +165,7 @@ function List(props) {
&& (
<Button
type="link"
onClick={() => {
setAddModalOpen(true);
setCurrentId(record.id);
@ -180,6 +181,7 @@ function List(props) {
&& (
<Button
type="link"
hidden={record.employmentFlag === 0}
onClick={() => onResetPassword(record.id)}
>
重置密码
@ -191,6 +193,7 @@ function List(props) {
&& (
<Button
type="link"
hidden={record.employmentFlag === 0}
onClick={() => {
props.history.push(`./add?id=${record.id}`);
}}

1
src/pages/Container/Stakeholder/User/ResignationReview/index.js
View File

@ -113,6 +113,7 @@ function ResignationReview(props) {
<Divider orientation="left"> 未完成工作</Divider>
<Table
pagination={false}
columns={[
{
title: "工作项目",

15
src/pages/Container/Supervision/BranchCompany/SubsidiaryUser/UserList/index.js
View File

@ -121,11 +121,16 @@ function AddModalComponent(props) {
const res = await props.requestDetails({
id: props.currentId,
});
res.data.userAvatarUrl = [
{
filePath: res.data.userAvatarUrl,
},
];
if (res.data && res.data.userAvatarUrl) {
res.data.userAvatarUrl = [
{
filePath: res.data.userAvatarUrl,
},
];
}
else {
res.data.userAvatarUrl = [];
}
setInfo(res.data);
};

1
src/pages/Container/Supervision/EnterpriseMiddleground/ChangeView/index.js
View File

@ -139,6 +139,7 @@ function ChangeView(props) {
/>
<Divider orientation="left">{queryParams["type"] === "disposal" ? "未完成工作" : "工作交接"}</Divider>
<Table
pagination={false}
columns={[
{
title: "工作项目",

2
src/pages/Container/Supervision/Supervision/Department/index.js
View File

@ -136,7 +136,7 @@ function Department(props) {
borderRight: "10px solid #f1f1f2",
paddingRight: "10px",
marginRight: "10px",
height: "100vh",
height: "calc(100dvh - 112px)",
}}
>
<LeftTree key={treeKey} onSelect={onTreeChange} onGetNodePaths={onGetNodePaths} onGetData={data => setDepartmentData(data)} />

2
src/pages/Container/Supervision/Supervision/Post/index.js
View File

@ -65,7 +65,7 @@ function Post(props) {
borderRight: "10px solid #f1f1f2",
paddingRight: "10px",
marginRight: "10px",
height: "100vh",
height: "calc(100dvh - 112px)",
}}
>
<LeftTree onSelect={onTreeChange} />

28
src/pages/Container/Supervision/Supervision/User/Add/index.js
View File

@ -55,6 +55,18 @@ function Add(props) {
const debouncedUsernameValue = useDebounce(usernameValue, 600);
const debouncedPhoneValueValue = useDebounce(phoneValue, 600);
const fnChoiceDepartment = async (event) => {
form.setFieldsValue({
postId: undefined,
});
// setDepartmentName(event[0].name)
props["postAll"]({
corpFlag: 1,
departmentId: event[event.length - 1].id,
}).then((res) => {
setPostData(res.data);
});
};
// const { loading: getFileLoading, getFile } = useGetFile();
const { loading: uploadFileLoading, uploadFile } = useUploadFile();
useEffect(() => {
@ -152,18 +164,7 @@ function Add(props) {
});
}
};
const fnChoiceDepartment = async (event) => {
form.setFieldsValue({
postId: undefined,
});
// setDepartmentName(event[0].name)
props["postAll"]({
corpFlag: 1,
departmentId: event[event.length - 1].id,
}).then((res) => {
setPostData(res.data);
});
};
// 校验身份证重复
useEffect(() => {
if (!debouncedUserIdCard) {
@ -175,8 +176,9 @@ function Add(props) {
]);
return;
}
props["verifyUser"]({
userIdCard: debouncedUserIdCard,
userIdCard: btoa(debouncedUserIdCard),
id: queryParams["id"] ?? "",
}).then((res) => {
if (!res.success) {

6
src/pages/Container/Supervision/Supervision/User/List/index.js
View File

@ -32,6 +32,7 @@ function List(props) {
const [rolesData, setRolesData] = useState([]);
const { downloadBlob } = useDownloadBlob();
const { importFile } = useImportFile();
const [treeKey, setTreeKey] = useState(0);
const [form] = Form.useForm();
const { tableProps, getData } = useTable(props["userList"], {
form,
@ -104,6 +105,7 @@ function List(props) {
if (res.success) {
message.success("导入成功");
getData();
setTreeKey(prev => prev + 1);
}
});
// message.success("导入成功");
@ -124,10 +126,10 @@ function List(props) {
borderRight: "10px solid #f1f1f2",
paddingRight: "10px",
marginRight: "10px",
height: "100vh",
height: "calc(100dvh - 112px)",
}}
>
<LeftTree onSelect={onTreeChange} />
<LeftTree onSelect={onTreeChange} key={treeKey} />
</div>
<div style={{ flex: 1, display: "flex", flexDirection: "column", minHeight: 0, padding: "20px 0" }}>
<Search