From acad2d34313061cefce34a5c7e3998314ba38943 Mon Sep 17 00:00:00 2001 From: wang_yp <357754663@qq.com> Date: Sat, 5 Oct 2024 01:36:14 +0800 Subject: [PATCH] dilog --- git.sh | 19 +++++++++++- src/pages/archives/archive.tsx | 13 ++++----- src/pages/archives/archivesCat.tsx | 4 ++- src/pages/archives/archivesFolder.tsx | 6 ++-- src/pages/dep/index.tsx | 2 ++ src/pages/emergency/index.tsx | 2 ++ src/pages/home/homeBottom/dispath.tsx | 32 ++++++++++----------- src/pages/home/homeLeft/home_left.tsx | 20 +++++++------ src/pages/home/homeLeft/orgin.tsx | 4 ++- src/pages/home/homeLeft/pover.tsx | 4 +-- src/pages/leaveApproval/level.tsx | 9 +++--- src/pages/leaveApproval/levelCat.tsx | 6 ++-- src/pages/materialMgmt/material.tsx | 2 ++ src/pages/materialMgmt/materialCat.tsx | 6 ++-- src/pages/patrol/index.tsx | 2 ++ src/pages/persMgmt/index.tsx | 4 ++- src/pages/polRegulations/regulations.tsx | 2 ++ src/pages/polRegulations/regulationsCat.tsx | 8 ++++-- src/pages/politicalStudy/index.tsx | 10 ++++--- src/pages/storage/index.tsx | 25 +++++++++++++--- src/pages/tag/tag.tsx | 14 +++++++-- src/pages/teamMgmt/index.tsx | 2 ++ src/pages/training/training.tsx | 4 ++- src/pages/training/trainingCat.tsx | 15 +++++----- src/pages/training/traningUser.tsx | 8 ++++-- src/pages/user/user.tsx | 6 ++-- src/pages/whseMgmt/index.tsx | 2 ++ 27 files changed, 156 insertions(+), 75 deletions(-) diff --git a/git.sh b/git.sh index a1c1f60..5600fc3 100644 --- a/git.sh +++ b/git.sh @@ -12,4 +12,21 @@ git push # scp -r ./card/ root@81.68.81.205:/mnt/www/html/shouka -# rm -rf card/ \ No newline at end of file +# rm -rf card/ + +# task +# pc +# 1、首页统计 +# 1、组织架构，组织架构图 +# 2、武装力量 报表 +# 3、年度训练 查看档案 +# 4、物资管理 处突 +# 5、档案管理 报表 +# 6、评优 +# 7 +# 2、物资借用以及归还 +# 3、任务关联档案 +# app +# 1、退伍军人 列表 详情 申请领取光荣牌 +# 2、接收任务 +# 3、任务列表 \ No newline at end of file diff --git a/src/pages/archives/archive.tsx b/src/pages/archives/archive.tsx index ccf7b8a..ceec2d0 100644 --- a/src/pages/archives/archive.tsx +++ b/src/pages/archives/archive.tsx @@ -19,14 +19,14 @@ const Archive = (props: Store) => { // 获取物资列表 useEffect(() => { folderStore.getlist().then(() => { - setStash(folderStore.list) + setStash(folderStore.list); setProjectConfig(defaultConfig); }); }, [folderStore]); // 获取分类 useEffect(() => { - archivesStore.getlist() + archivesStore.getlist(); }, [archivesStore]); const column_widget = (any, record) => { @@ -106,10 +106,12 @@ const Archive = (props: Store) => { /> formRef.current?.resetFields()} onOk={() => formRef.current?.submit()} + okText="确定" + cancelText="取消" onCancel={() => { setIsModalOpen(false); }} @@ -156,7 +158,4 @@ const Archive = (props: Store) => { ); }; -export default inject( - "archivesStore", - "folderStore" -)(observer(Archive)); +export default inject("archivesStore", "folderStore")(observer(Archive)); diff --git a/src/pages/archives/archivesCat.tsx b/src/pages/archives/archivesCat.tsx index fc6be48..d07a321 100644 --- a/src/pages/archives/archivesCat.tsx +++ b/src/pages/archives/archivesCat.tsx @@ -90,10 +90,12 @@ const ArchivesCat = (props: Store) => { /> formRef.current?.resetFields()} onOk={() => formRef.current?.submit()} + okText="确定" + cancelText="取消" onCancel={() => { setIsModalOpen(false); }} diff --git a/src/pages/archives/archivesFolder.tsx b/src/pages/archives/archivesFolder.tsx index d667401..9572f7a 100644 --- a/src/pages/archives/archivesFolder.tsx +++ b/src/pages/archives/archivesFolder.tsx @@ -57,7 +57,7 @@ const ArchivesFolder = (props: Store) => { const folderHandle = (e) => { folderStore.getAlist(e.identity).then((res) => { setIsModalOpenArchives(true); - }) + }); }; const onFinishFailed = () => {}; return ( @@ -72,7 +72,7 @@ const ArchivesFolder = (props: Store) => { {Array.from({ length: folderStore.list?.length ?? 0 }, (_, i) => (
folderHandle(folderStore.list[i])} + onClick={() => folderHandle(folderStore.list[i])} style={{ cursor: "pointer", width: "120px" }} > @@ -98,6 +98,8 @@ const ArchivesFolder = (props: Store) => { afterClose={() => formRef.current?.resetFields()} onOk={() => formRef.current?.submit()} onCancel={cancelHandler} + okText="确定" + cancelText="取消" > { open={isModalOpen} afterClose={() => formRef.current?.resetFields()} onOk={() => formRef.current?.submit()} + okText="确定" + cancelText="取消" onCancel={() => { setId(null); setIsModalOpen(false); diff --git a/src/pages/emergency/index.tsx b/src/pages/emergency/index.tsx index 3ede07c..9dbd1ba 100644 --- a/src/pages/emergency/index.tsx +++ b/src/pages/emergency/index.tsx @@ -173,6 +173,8 @@ const Emergency = (props: Store) => { open={isModalOpen} afterClose={() => formRef.current?.resetFields()} onOk={() => formRef.current?.submit()} + okText="确定" + cancelText="取消" onCancel={() => { setId(null); setIsModalOpen(false); diff --git a/src/pages/home/homeBottom/dispath.tsx b/src/pages/home/homeBottom/dispath.tsx index 3dc0858..cbacec7 100644 --- a/src/pages/home/homeBottom/dispath.tsx +++ b/src/pages/home/homeBottom/dispath.tsx @@ -39,23 +39,21 @@ const Dispath = (props: Store) => { const [userList, setUserList] = useState([]); useEffect(() => { - - try { - trainingCatStore.getlist().then(() => { - setStashList(trainingCatStore.list); - }); - baseHttp.get("/user/list", null).then((res) => { - let data = res.data?.record ?? []; - data.forEach((item) => { - item.label = item.account; - item.value = item.identity; + try { + trainingCatStore.getlist().then(() => { + setStashList(trainingCatStore.list); }); - setUserList(data ?? []); - }); - } catch (error) { - console.log(error); - - } + baseHttp.get("/user/list", null).then((res) => { + let data = res.data?.record ?? []; + data.forEach((item) => { + item.label = item.account; + item.value = item.identity; + }); + setUserList(data ?? []); + }); + } catch (error) { + console.log(error); + } }, [trainingCatStore]); const onFinish = (values: any) => { @@ -77,6 +75,8 @@ const Dispath = (props: Store) => { open={isModalOpen} afterClose={() => {}} onOk={() => {}} + okText="确定" + cancelText="取消" footer={[ { dataSource={regulationsCatStore.list} /> formRef.current?.resetFields()} onOk={() => formRef.current?.submit()} + okText="确定" + cancelText="取消" onCancel={() => { setIsModalOpen(false); }} diff --git a/src/pages/politicalStudy/index.tsx b/src/pages/politicalStudy/index.tsx index 74e5e1b..6ef1f36 100644 --- a/src/pages/politicalStudy/index.tsx +++ b/src/pages/politicalStudy/index.tsx @@ -50,15 +50,15 @@ const PoliticalStudy = (props: Store) => { const onFinish = (values: any) => { let data = { ...values, - score:Number(values.score) - } - if (values.file_url){ + score: Number(values.score), + }; + if (values.file_url) { data.file_url = values.file_url[0].url; } if (!record?.id) { politicalStudyStore.add(data); } else { - politicalStudyStore.putItem(record.id,data); + politicalStudyStore.putItem(record.id, data); } setIsModalOpen(false); }; @@ -100,6 +100,8 @@ const PoliticalStudy = (props: Store) => { open={isModalOpen} afterClose={() => formRef.current?.resetFields()} onOk={() => formRef.current?.submit()} + okText="确定" + cancelText="取消" onCancel={() => { setIsModalOpen(false); }} diff --git a/src/pages/storage/index.tsx b/src/pages/storage/index.tsx index fe6eb2b..0fca1cd 100644 --- a/src/pages/storage/index.tsx +++ b/src/pages/storage/index.tsx @@ -22,8 +22,23 @@ const Storage = (props: Store) => { const column_widget = (any, record) => { return ( - - + @@ -40,9 +55,9 @@ const Storage = (props: Store) => { stash_identity: id, }; if (!record?.id) { - storageStore.add(data,{stash_identity:id}); + storageStore.add(data, { stash_identity: id }); } else { - storageStore.putItem(record.id, data,{stash_identity:id}); + storageStore.putItem(record.id, data, { stash_identity: id }); } setIsModalOpen(false); }; @@ -84,6 +99,8 @@ const Storage = (props: Store) => { open={isModalOpen} afterClose={() => formRef.current?.resetFields()} onOk={() => formRef.current?.submit()} + okText="确定" + cancelText="取消" onCancel={() => { setIsModalOpen(false); }} diff --git a/src/pages/tag/tag.tsx b/src/pages/tag/tag.tsx index 1c29c57..5cbcf86 100644 --- a/src/pages/tag/tag.tsx +++ b/src/pages/tag/tag.tsx @@ -25,7 +25,15 @@ const Tag = (props: Store) => {
- +
diff --git a/src/pages/training/trainingCat.tsx b/src/pages/training/trainingCat.tsx index b02e2bd..d11e2f6 100644 --- a/src/pages/training/trainingCat.tsx +++ b/src/pages/training/trainingCat.tsx @@ -7,7 +7,6 @@ // }; // export default TrainingCat; - import { Button, Space, Modal, FormInstance } from "antd"; import { inject, observer } from "mobx-react"; import type { ColumnsType } from "antd/es/table"; @@ -48,7 +47,7 @@ const TrainingCat = (props: Store) => { danger size="small" onClick={() => { - dele(record) + dele(record); }} > 删除 @@ -57,12 +56,12 @@ const TrainingCat = (props: Store) => { ), }, ]; - const dele = (record)=>{ + const dele = (record) => { trainingCatStore.deleteItem(record.identity); - } + }; const edit = (record) => { setProjectConfig(defaultConfig); - + setIsModalOpen(true); formRef.current?.setFieldsValue(record); setRecord(record); @@ -122,11 +121,13 @@ const TrainingCat = (props: Store) => { dataSource={trainingCatStore.list} /> formRef.current?.resetFields()} onOk={() => formRef.current?.submit()} + okText="确定" + cancelText="取消" onCancel={() => { setId(null); setIsModalOpen(false); diff --git a/src/pages/training/traningUser.tsx b/src/pages/training/traningUser.tsx index 4c08ec9..ce4c03e 100644 --- a/src/pages/training/traningUser.tsx +++ b/src/pages/training/traningUser.tsx @@ -26,9 +26,9 @@ const TraningUser = (props: Store) => { }); } let res = trainingStore.setUserScore(arr); - if (res){ - message.success("积分设置成功") - setIsModalOpenUser(false); + if (res) { + message.success("积分设置成功"); + setIsModalOpenUser(false); } }; const _columns: ColumnsType = [ @@ -74,6 +74,8 @@ const TraningUser = (props: Store) => { width={300} open={isModalOpenUser} onOk={() => okhandler()} + okText="确定" + cancelText="取消" afterClose={() => setKeys([])} onCancel={() => { setIsModalOpenUser(false); diff --git a/src/pages/user/user.tsx b/src/pages/user/user.tsx index b33c1eb..3bb135c 100644 --- a/src/pages/user/user.tsx +++ b/src/pages/user/user.tsx @@ -89,9 +89,9 @@ const User = (props: Store) => { { title: "操作", dataIndex: "id", - fixed: 'right', + fixed: "right", ellipsis: { showTitle: false }, - render: (any, record)=>actionWidget(any, record), + render: (any, record) => actionWidget(any, record), }, ]} dataSource={usrStore.list} @@ -102,6 +102,8 @@ const User = (props: Store) => { open={isModalOpen} afterClose={() => formRef.current?.resetFields()} onOk={() => formRef.current?.submit()} + okText="确定" + cancelText="取消" onCancel={() => { setId(null); setIsModalOpen(false); diff --git a/src/pages/whseMgmt/index.tsx b/src/pages/whseMgmt/index.tsx index 3b95721..c74d11d 100644 --- a/src/pages/whseMgmt/index.tsx +++ b/src/pages/whseMgmt/index.tsx @@ -107,6 +107,8 @@ const WhseMgmt = (props: Store) => { open={isModalOpen} afterClose={() => formRef.current?.resetFields()} onOk={() => formRef.current?.submit()} + okText="确定" + cancelText="取消" onCancel={() => { setIsModalOpen(false); }}