dilog

git.sh

@@ -13,3 +13,20 @@ git push
 # scp -r ./card/ root@81.68.81.205:/mnt/www/html/shouka
 
 # rm -rf card/
+
+# task
+#  pc 
+#     1、首页统计
+#         1、组织架构，组织架构图
+#         2、武装力量 报表
+#         3、年度训练 查看档案
+#         4、物资管理 处突
+#         5、档案管理 报表
+#         6、评优
+#         7
+#     2、物资借用以及归还
+#     3、任务关联档案
+# app 
+#     1、退伍军人 列表 详情 申请领取光荣牌
+#     2、接收任务
+#     3、任务列表

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) => {
         />
         <Modal
           title={!record?.id ? "添加档案" : "编辑档案"}
-          width={1200}
+          width={600}
           open={isModalOpen}
           afterClose={() => formRef.current?.resetFields()}
           onOk={() => formRef.current?.submit()}
+          okText="确定"
+          cancelText="取消"
           onCancel={() => {
             setIsModalOpen(false);
           }}
@@ -156,7 +158,4 @@ const Archive = (props: Store) => {
   );
 };
 
-export default inject(
+export default inject("archivesStore", "folderStore")(observer(Archive));
-  "archivesStore",
-  "folderStore"
-)(observer(Archive));

src/pages/archives/archivesCat.tsx

@@ -90,10 +90,12 @@ const ArchivesCat = (props: Store) => {
         />
         <Modal
           title={!record?.id ? "添加档案类别" : "编辑档案类别"}
-          width={1200}
+          width={600}
           open={isModalOpen}
           afterClose={() => formRef.current?.resetFields()}
           onOk={() => formRef.current?.submit()}
+            okText="确定"
+          cancelText="取消"
           onCancel={() => {
             setIsModalOpen(false);
           }}

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) => (
             <div
               key={i}
-              onClick={()=>folderHandle(folderStore.list[i])}
+              onClick={() => folderHandle(folderStore.list[i])}
               style={{ cursor: "pointer", width: "120px" }}
             >
               <FolderTwoTone rotate={-270} style={{ fontSize: "80px" }} />
@@ -98,6 +98,8 @@ const ArchivesFolder = (props: Store) => {
           afterClose={() => formRef.current?.resetFields()}
           onOk={() => formRef.current?.submit()}
           onCancel={cancelHandler}
+          okText="确定"
+          cancelText="取消"
         >
           <SimpleForm
             formRef={formRef}

src/pages/dep/index.tsx

@@ -141,6 +141,8 @@ const Dep = (props: Store) => {
           open={isModalOpen}
           afterClose={() => formRef.current?.resetFields()}
           onOk={() => formRef.current?.submit()}
+            okText="确定"
+          cancelText="取消"
           onCancel={() => {
             setId(null);
             setIsModalOpen(false);

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);

src/pages/home/homeBottom/dispath.tsx

@@ -39,7 +39,6 @@ const Dispath = (props: Store) => {
   const [userList, setUserList] = useState<any>([]);
 
   useEffect(() => {
-   
     try {
       trainingCatStore.getlist().then(() => {
         setStashList(trainingCatStore.list);
@@ -54,7 +53,6 @@ const Dispath = (props: Store) => {
       });
     } catch (error) {
       console.log(error);
-    
     }
   }, [trainingCatStore]);
 
@@ -77,6 +75,8 @@ const Dispath = (props: Store) => {
         open={isModalOpen}
         afterClose={() => {}}
         onOk={() => {}}
+        okText="确定"
+        cancelText="取消"
         footer={[
           <Button key="return" ghost onClick={handleCancle}>
             取消

src/pages/home/homeLeft/home_left.tsx

@@ -96,6 +96,8 @@ const HomeLeft = () => {
         width={"80%"}
         open={isModalOpen}
         afterClose={() => {}}
+        okText="确定"
+        cancelText="取消"
         onOk={() => {}}
         onCancel={() => {
           setIsModalOpen(false);

src/pages/home/homeLeft/orgin.tsx

@@ -29,6 +29,8 @@ const Orgin = () => {
         title={"组织架构"}
         className="owner_model"
         width={"80%"}
+        okText="确定"
+        cancelText="取消"
         open={isModalOpen}
         onCancel={handleCancel}
         footer={null}

src/pages/home/homeLeft/pover.tsx

@@ -35,9 +35,7 @@ const Pover = () => {
           type: "bar",
           barWidth: 10, // 设置柱子粗细
           itemStyle: {
-            normal: {
+            borderRadius: [5, 5, 0, 0],
-              barBorderRadius: [5, 5, 0, 0],
-            },
           },
         },
       ],

src/pages/leaveApproval/level.tsx

@@ -33,7 +33,7 @@ const Leave = (props: Store) => {
     leaveStore.access(record.id, { status: 1 });
   };
   const column_widget = (any, record) => {
-    if (record.status===0){
+    if (record.status === 0) {
       return (
         <Space wrap>
           <Button
@@ -58,7 +58,6 @@ const Leave = (props: Store) => {
       );
     }
     return <div></div>;
-   
   };
   return (
     <>
@@ -70,9 +69,9 @@ const Leave = (props: Store) => {
             title: "操作",
             dataIndex: "id",
             ellipsis: {
-              showTitle: false
+              showTitle: false,
             },
-            render: (any, record) => column_widget(any, record)
+            render: (any, record) => column_widget(any, record),
           },
         ]}
         dataSource={leaveStore.list}
@@ -86,6 +85,8 @@ const Leave = (props: Store) => {
         onCancel={() => {
           setIsModalOpen(false);
         }}
+        okText="确定"
+        cancelText="取消"
       >
         <SimpleForm
           formRef={formRef}

src/pages/leaveApproval/levelCat.tsx

@@ -50,7 +50,7 @@ const LeaveCat = (props: Store) => {
   const onFinish = (values: any) => {
     let data = {
       ...values,
-      pid:values.pid??0
+      pid: values.pid ?? 0,
     };
     if (!record?.id) {
       leaveCategoryStore.add(data);
@@ -97,6 +97,8 @@ const LeaveCat = (props: Store) => {
           open={isModalOpen}
           afterClose={() => formRef.current?.resetFields()}
           onOk={() => formRef.current?.submit()}
+          okText="确定"
+          cancelText="取消"
           onCancel={() => {
             setIsModalOpen(false);
           }}

src/pages/materialMgmt/material.tsx

@@ -126,6 +126,8 @@ const Material = (props: Store) => {
           open={isModalOpen}
           afterClose={() => formRef.current?.resetFields()}
           onOk={() => formRef.current?.submit()}
+          okText="确定"
+          cancelText="取消"
           onCancel={() => {
             setIsModalOpen(false);
           }}

src/pages/materialMgmt/materialCat.tsx

@@ -50,7 +50,7 @@ const MaterialCat = (props: Store) => {
   const onFinish = (values: any) => {
     let data = {
       ...values,
-      pid:values.pid??0
+      pid: values.pid ?? 0,
     };
     if (!record?.id) {
       materialCatStore.add(data);
@@ -97,6 +97,8 @@ const MaterialCat = (props: Store) => {
           open={isModalOpen}
           afterClose={() => formRef.current?.resetFields()}
           onOk={() => formRef.current?.submit()}
+          okText="确定"
+          cancelText="取消"
           onCancel={() => {
             setIsModalOpen(false);
           }}

src/pages/patrol/index.tsx

@@ -197,6 +197,8 @@ const Patrol = (props: Store) => {
           open={isModalOpen}
           afterClose={() => formRef.current?.resetFields()}
           onOk={() => formRef.current?.submit()}
+          okText="确定"
+          cancelText="取消"
           onCancel={() => {
             setId(null);
             setIsModalOpen(false);

src/pages/persMgmt/index.tsx

@@ -98,6 +98,8 @@ const PersMgmt = (props: Store) => {
           open={isModalOpen}
           afterClose={() => formRef.current?.resetFields()}
           onOk={() => formRef.current?.submit()}
+          okText="确定"
+          cancelText="取消"
           onCancel={() => {
             setIsModalOpen(false);
           }}

src/pages/polRegulations/regulations.tsx

@@ -111,6 +111,8 @@ const Regulations = (props: Store) => {
           open={isModalOpen}
           afterClose={() => formRef.current?.resetFields()}
           onOk={() => formRef.current?.submit()}
+          okText="确定"
+          cancelText="取消"
           onCancel={() => {
             setIsModalOpen(false);
           }}

src/pages/polRegulations/regulationsCat.tsx

@@ -73,7 +73,7 @@ const RegulationsCat = (props: Store) => {
               setIsModalOpen(true);
             }}
           >
-            添加物资分类
+            添加类别
           </Button>
         </Space>
         <BTable
@@ -92,11 +92,13 @@ const RegulationsCat = (props: Store) => {
           dataSource={regulationsCatStore.list}
         />
         <Modal
-          title={!record?.id ? "添加个人属性" : "编辑个人属性"}
+          title={!record?.id ? "添加分类" : "编辑分类"}
-          width={1200}
+          width={600}
           open={isModalOpen}
           afterClose={() => formRef.current?.resetFields()}
           onOk={() => formRef.current?.submit()}
+          okText="确定"
+          cancelText="取消"
           onCancel={() => {
             setIsModalOpen(false);
           }}

src/pages/politicalStudy/index.tsx

@@ -50,15 +50,15 @@ const PoliticalStudy = (props: Store) => {
   const onFinish = (values: any) => {
     let data = {
       ...values,
-      score:Number(values.score)
+      score: Number(values.score),
-    }
+    };
-    if (values.file_url){
+    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);
           }}

src/pages/storage/index.tsx

@@ -22,8 +22,23 @@ const Storage = (props: Store) => {
   const column_widget = (any, record) => {
     return (
       <Space wrap>
-        <Button type="dashed" size="small" onClick={() => {edit(record)}}>编辑</Button>
+        <Button
-        <Button type="dashed" danger size="small" onClick={() => {storageStore.deleteItem(record.id)}}>
+          type="dashed"
+          size="small"
+          onClick={() => {
+            edit(record);
+          }}
+        >
+          编辑
+        </Button>
+        <Button
+          type="dashed"
+          danger
+          size="small"
+          onClick={() => {
+            storageStore.deleteItem(record.id);
+          }}
+        >
           删除
         </Button>
       </Space>
@@ -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);
           }}

src/pages/tag/tag.tsx

@@ -25,7 +25,15 @@ const Tag = (props: Store) => {
         <div>
           <Space direction="vertical">
             <Space wrap>
-              <Button type="dashed" size="small" onClick={() => {edit(record);}}>编辑</Button>
+              <Button
+                type="dashed"
+                size="small"
+                onClick={() => {
+                  edit(record);
+                }}
+              >
+                编辑
+              </Button>
               <Button
                 type="dashed"
                 danger
@@ -57,7 +65,7 @@ const Tag = (props: Store) => {
     if (!tagId) {
       tagStore.add(values);
     } else {
-      tagStore.putItem(tagId,values);
+      tagStore.putItem(tagId, values);
     }
     setIsModalOpen(false);
   };
@@ -104,6 +112,8 @@ const Tag = (props: Store) => {
           open={isModalOpen}
           afterClose={() => formRef.current?.resetFields()}
           onOk={() => formRef.current?.submit()}
+          okText="确定"
+          cancelText="取消"
           onCancel={() => {
             setId(null);
             setIsModalOpen(false);

src/pages/teamMgmt/index.tsx

@@ -98,6 +98,8 @@ const TeamMgmt = (props: Store) => {
           open={isModalOpen}
           afterClose={() => formRef.current?.resetFields()}
           onOk={() => formRef.current?.submit()}
+          okText="确定"
+          cancelText="取消"
           onCancel={() => {
             setIsModalOpen(false);
           }}

src/pages/training/training.tsx

@@ -161,6 +161,8 @@ const Trainings = (props: Store) => {
           open={isModalOpen}
           afterClose={() => formRef.current?.resetFields()}
           onOk={() => formRef.current?.submit()}
+          okText="确定"
+          cancelText="取消"
           onCancel={() => {
             setId(null);
             setIsModalOpen(false);
@@ -209,7 +211,7 @@ const Trainings = (props: Store) => {
             setIsModalOpenUser(false);
           }}
         >
-          <TraningUser/>
+          <TraningUser />
         </Modal>
       </Space>
     </div>

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,9 +56,9 @@ const TrainingCat = (props: Store) => {
       ),
     },
   ];
-  const dele = (record)=>{
+  const dele = (record) => {
     trainingCatStore.deleteItem(record.identity);
-  }
+  };
   const edit = (record) => {
     setProjectConfig(defaultConfig);
 
@@ -122,11 +121,13 @@ const TrainingCat = (props: Store) => {
           dataSource={trainingCatStore.list}
         />
         <Modal
-          title={!tagId ? "任务发布" : "任务编辑"}
+          title={!tagId ? "添加分类" : "分类编辑"}
-          width={1200}
+          width={600}
           open={isModalOpen}
           afterClose={() => formRef.current?.resetFields()}
           onOk={() => formRef.current?.submit()}
+          okText="确定"
+          cancelText="取消"
           onCancel={() => {
             setId(null);
             setIsModalOpen(false);

src/pages/training/traningUser.tsx

@@ -26,8 +26,8 @@ const TraningUser = (props: Store) => {
       });
     }
     let res = trainingStore.setUserScore(arr);
-    if (res){
+    if (res) {
-        message.success("积分设置成功")
+      message.success("积分设置成功");
       setIsModalOpenUser(false);
     }
   };
@@ -74,6 +74,8 @@ const TraningUser = (props: Store) => {
         width={300}
         open={isModalOpenUser}
         onOk={() => okhandler()}
+        okText="确定"
+        cancelText="取消"
         afterClose={() => setKeys([])}
         onCancel={() => {
           setIsModalOpenUser(false);

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);

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);
           }}