调整发版前的问题

src/components/BMSTable/style.less

@@ -40,6 +40,7 @@
     .bms-ant-table-thead {
         .bms-ant-table-cell {
             border-bottom: none !important;
+            padding: 12px 16px !important;
             //border-top:1px solid #dae2f2 !important ;
             background: rgb(238 243 250 / 100%) !important;
 

src/pages/secondaryDistribute/employeeInfoCheck/index.tsx

@@ -4,7 +4,7 @@
  * @Author: code4eat awesomedema@gmail.com
  * @Date: 2022-12-16 09:42:52
  * @LastEditors: code4eat awesomedema@gmail.com
- * @LastEditTime: 2023-05-11 17:16:08
+ * @LastEditTime: 2023-05-12 10:06:07
  * @FilePath: /BudgetManaSystem/src/pages/budgetMana/monthlySet/index.tsx
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -513,7 +513,12 @@ const EmployeeInfoCheck: React.FC = () => {
     }, [treeData]);
 
 
-
+    useEffect(()=>{
+          if(auditType == '1'){
+                //当审核中时，禁掉所有操作
+                set_commitStatus('1');
+          }
+    },[auditType])
 
     useEffect(() => {
         set_tableColumn(column as ProColumns[]);
@@ -570,7 +575,7 @@ const EmployeeInfoCheck: React.FC = () => {
                                     return <div style={{
                                         display: 'flex', flexDirection: 'row',
                                         width: '100%',
-                                        justifyContent: 'flex-start', alignItems: 'center', height: 32,
+                                        justifyContent: 'space-between', alignItems: 'center', height: 32,
                                         borderRadius: '4px',
                                         overflow: 'hidden',
                                         color: '#17181A',

src/pages/setting/checkUnitSet/checkUnitMana/index.tsx

@@ -4,7 +4,7 @@
  * @Author: code4eat awesomedema@gmail.com
  * @Date: 2022-12-16 09:42:52
  * @LastEditors: code4eat awesomedema@gmail.com
- * @LastEditTime: 2023-04-26 15:36:03
+ * @LastEditTime: 2023-05-12 11:15:21
  * @FilePath: /BudgetManaSystem/src/pages/budgetMana/monthlySet/index.tsx
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -95,7 +95,7 @@ const CheckUnitMana: React.FC = () => {
             }
         },
         {
-            title: '特殊分级',
+            title: '单元分级',
             dataIndex: 'unitLevelName',
             // render: (_: any, record: any) => {
             //     return record.specialUnit == 1 ? '是' : '否'
@@ -222,7 +222,7 @@ const CheckUnitMana: React.FC = () => {
                     rules={[{ required: true, message: '特殊单元不能为空!' }]}
                 />
 
-                <ProFormSelect label="核算单元分级："
+                <ProFormSelect label="单元分级："
                     name='unitLevel'
                     options={(getDataByKeyFromDic(dicData, '4')).list}
                     rules={[{ required: true, message: '职类不能为空!' }]}

src/pages/setting/checkUnitSet/checkUnitMana/style.less

@@ -57,7 +57,7 @@
                     align-items: center;
 
                     .searchInput {
-                        width: 167px;
+                        width: 190px;
                         height: 24px;
                         background: #FFF;
                         border-radius: 4px;

src/pages/setting/checkUnitSet/medicalGroupSet/index.tsx

@@ -2,7 +2,7 @@
  * @Author: code4eat awesomedema@gmail.com
  * @Date: 2023-03-03 11:30:33
  * @LastEditors: code4eat awesomedema@gmail.com
- * @LastEditTime: 2023-05-04 11:50:01
+ * @LastEditTime: 2023-05-12 10:19:02
  * @FilePath: /KC-MiddlePlatform/src/pages/platform/setting/pubDicTypeMana/index.tsx
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -100,6 +100,7 @@ const MedicalGroupSet = () => {
         const resp = await delTableData(record ? [record.id] : [...tableSelectedKeys]);
 
         if (resp) {
+            set_selectedAddKeys([]);
             tableRef.current?.reload();
         }
     }
@@ -494,7 +495,7 @@ const MedicalGroupSet = () => {
                         rowSelection={{
                             // 自定义选择项参考: https://ant.design/components/table-cn/#components-table-demo-row-selection-custom
                             // 注释该行则默认不显示下拉选项
-                            selections: [Table.SELECTION_ALL, Table.SELECTION_INVERT, Table.SELECTION_NONE,],
+                            //selections: [Table.SELECTION_ALL, Table.SELECTION_INVERT, Table.SELECTION_NONE,],
                             onChange: onTableSelectChange,
 
                         }}

src/pages/setting/checkUnitSet/viewUnitPermSet/index.tsx

@@ -2,7 +2,7 @@
  * @Author: code4eat awesomedema@gmail.com
  * @Date: 2023-03-03 11:30:33
  * @LastEditors: code4eat awesomedema@gmail.com
- * @LastEditTime: 2023-04-27 14:26:30
+ * @LastEditTime: 2023-05-12 11:12:53
  * @FilePath: /KC-MiddlePlatform/src/pages/platform/setting/pubDicTypeMana/index.tsx
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -311,7 +311,7 @@ export default function ViewUnitPermSet() {
         <BMSPagecontainer className='ViewUnitPermSet' title={false}>
             <div className='tableToolbar'>
                 <div className='search'>
-                    <span>人员：</span><Input className='searchInput' allowClear placeholder="请输入工号、姓名" onChange={(e) => {
+                    <span>检索：</span><Input className='searchInput' allowClear placeholder="请输入工号、姓名" onChange={(e) => {
                         set_tableDataSearchKeywords(e.target.value);
                         if (e.target.value.length == 0) {
                             set_tableDataFilterParams({ ...tableDataFilterParams, name: '' });

src/pages/setting/checkUnitSet/viewUnitPermSet/style.less

@@ -17,7 +17,7 @@
       align-items: center;
 
       .searchInput {
-        width: 167px;
+        width: 175px;
         height: 24px;
         background: #FFF;
         border-radius: 4px;

src/pages/setting/projectSetting/bilingProjectMana/index.tsx

@@ -2,7 +2,7 @@
  * @Author: code4eat awesomedema@gmail.com
  * @Date: 2023-03-03 11:30:33
  * @LastEditors: code4eat awesomedema@gmail.com
- * @LastEditTime: 2023-05-11 16:38:08
+ * @LastEditTime: 2023-05-11 17:33:15
  * @FilePath: /KC-MiddlePlatform/src/pages/platform/setting/pubDicTypeMana/index.tsx
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -163,7 +163,7 @@ export default function BilingProjectMana() {
                     type == 'EDIT' ? <a key="edit" >编辑</a> : <span className='add'>新增</span>
                 }
                 onFinish={(val) => {
-                    return updateTable(type == 'EDIT' ? { ...record, ...val } : { ...val }, type);
+                    return updateTable(type == 'EDIT' ? { ...record, ...val,orderPointValue:val.orderPointValue?val.orderPointValue:undefined} : { ...val }, type);
                 }}
                 modalProps={{ destroyOnClose: true }}
                 colProps={{ span: 24 }}

src/pages/setting/projectSetting/indicProjectMana/index.tsx

@@ -2,7 +2,7 @@
  * @Author: code4eat awesomedema@gmail.com
  * @Date: 2023-03-03 11:30:33
  * @LastEditors: code4eat awesomedema@gmail.com
- * @LastEditTime: 2023-05-11 16:38:32
+ * @LastEditTime: 2023-05-11 17:35:35
  * @FilePath: /KC-MiddlePlatform/src/pages/platform/setting/pubDicTypeMana/index.tsx
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -166,7 +166,7 @@ export default function BilingProjectMana() {
                     type == 'EDIT' ? <a key="edit" >编辑</a> : <span className='add'>新增</span>
                 }
                 onFinish={(val) => {
-                    return updateTable(type == 'EDIT' ? { ...record, ...val } : { ...val }, type);
+                    return updateTable(type == 'EDIT' ? { ...record, ...val,orderPointValue:val.orderPointValue?val.orderPointValue:undefined } : { ...val }, type);
                 }}
                 modalProps={{ destroyOnClose: true }}
                 colProps={{ span: 24 }}

src/pages/setting/projectSetting/nonAssessmentProjectMana/index.tsx

@@ -2,7 +2,7 @@
  * @Author: code4eat awesomedema@gmail.com
  * @Date: 2023-03-03 11:30:33
  * @LastEditors: code4eat awesomedema@gmail.com
- * @LastEditTime: 2023-05-11 14:14:10
+ * @LastEditTime: 2023-05-12 11:09:29
  * @FilePath: /KC-MiddlePlatform/src/pages/platform/setting/pubDicTypeMana/index.tsx
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -30,7 +30,7 @@ import './style.less';
 
 
 const IconFont = createFromIconfontCN({
-    scriptUrl: '//at.alicdn.com/t/c/font_1927152_4nm5kxbv4m3.js',
+    scriptUrl: '//at.alicdn.com/t/c/font_1927152_p7y3y2t8lg.js',
 });
 
 const AddIconFont = createFromIconfontCN({
@@ -39,7 +39,7 @@ const AddIconFont = createFromIconfontCN({
 
 
 
-export default function MonAssessmentProjectMana() {
+export default function NonAssessmentProjectMana() {
 
     const [tableDataFilterParams, set_tableDataFilterParams] = useState<any | undefined>();
     const [tableDataSearchKeywords, set_tableDataSearchKeywords] = useState<string>('');
@@ -145,6 +145,8 @@ export default function MonAssessmentProjectMana() {
             ceiling: formVal.ceiling
         }
 
+        let flag = true;
+
         if (type == 'ADD') {
             const resp = await addData({ ...result });
             if (resp) {
@@ -170,10 +172,12 @@ export default function MonAssessmentProjectMana() {
             if (resp) {
                 tableRef.current?.reload();
                 message.success('操作成功！');
+            }else{
+                flag = false
             }
         }
 
-        return true;
+        return flag;
     }
 
     const [dicData, set_dicData] = useState<any[]>([]);
@@ -242,7 +246,7 @@ export default function MonAssessmentProjectMana() {
         return (
             <ModalForm
                 title={`${type == 'EDIT' ? '编辑' : '新增'}${type == 'SCORE'?'评分项':'非考核项目'}`}
-                className='MonAssessmentProjectMana-ModalForm'
+                className='NonAssessmentProjectMana-ModalForm'
                 width={352}
                 initialValues={type == 'EDIT' ? { ...record } :type == 'SCORE'?{...scoreInitList}:{}}
                 trigger={
@@ -307,7 +311,7 @@ export default function MonAssessmentProjectMana() {
                                                     }}
                                                 />
                                             </Form.Item>
-                                            <span className='delIcon' onClick={() => delGroupIndic(item, index)}><IconFont type="iconshanchu" /></span>
+                                            <span className='delIcon' onClick={() => delGroupIndic(item, index)}><IconFont  type="iconshanchu" /></span>
                                         </div>
                                     )
                                 })
@@ -425,7 +429,7 @@ export default function MonAssessmentProjectMana() {
     }, [])
 
     return (
-        <BMSPagecontainer className='BilingProjectMana' title={false}>
+        <BMSPagecontainer className='NonAssessmentProjectMana' title={false}>
             <div className='toolBar'>
                 <div className='filter'>
                     <div className='filterItem'>

src/pages/setting/projectSetting/nonAssessmentProjectMana/style.less

@@ -1,5 +1,5 @@
 
-.MonAssessmentProjectMana-ModalForm {
+.NonAssessmentProjectMana-ModalForm {
   .item {
     display: flex;
     flex-direction: row;
@@ -18,6 +18,12 @@
       background: #FAFCFF;
       border-radius: 4px;
       border: 1px solid #DAE2F2;
+      .iconshanchu {
+        color: #17181A !important;
+        svg {
+          color: #17181A !important;
+        }
+      }
     }
   }
   .addBtn {
@@ -39,7 +45,7 @@
   }
 }
 
-.BilingProjectMana {
+.NonAssessmentProjectMana {
   padding: 16px;
   background: #FFFFFF;
   border-radius: 4px;

src/pages/setting/projectSetting/occupationsSecondaryDistriSet/index.tsx

@@ -2,7 +2,7 @@
  * @Author: code4eat awesomedema@gmail.com
  * @Date: 2023-03-03 11:30:33
  * @LastEditors: code4eat awesomedema@gmail.com
- * @LastEditTime: 2023-05-11 16:50:03
+ * @LastEditTime: 2023-05-12 10:22:13
  * @FilePath: /KC-MiddlePlatform/src/pages/platform/setting/pubDicTypeMana/index.tsx
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -505,7 +505,7 @@ export default function OccupationsSecondaryDistriSet() {
                     rowSelection={ifAdjustment ? false : {
                         // 自定义选择项参考: https://ant.design/components/table-cn/#components-table-demo-row-selection-custom
                         // 注释该行则默认不显示下拉选项
-                        selections: [Table.SELECTION_ALL, Table.SELECTION_INVERT],
+                        //selections: [Table.SELECTION_ALL, Table.SELECTION_INVERT],
                         onChange: onTableSelectChange,
                     }}
 

src/services/getDic.ts

@@ -2,7 +2,7 @@
  * @Author: code4eat awesomedema@gmail.com
  * @Date: 2023-04-20 14:06:17
  * @LastEditors: code4eat awesomedema@gmail.com
- * @LastEditTime: 2023-04-26 15:25:58
+ * @LastEditTime: 2023-05-11 17:27:16
  * @FilePath: /BudgetManaSystem/src/services/getDic.ts
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -28,8 +28,6 @@ export const getPubDicData =  () => {
 
 export const getDataByKeyFromDic = (dicData:any[],key: string) => {
 
-    console.log({dicData});
-
     let result = dicData.filter((t: any) => (t.code == key));
 
     if (result.length > 0) {