瀏覽代碼

修复指标项目管理点值负数支持

code4eat 2 年之前
父節點
當前提交
cec74647ab

+ 2 - 4
.umirc.ts

@@ -2,7 +2,7 @@
  * @Author: code4eat awesomedema@gmail.com
  * @Date: 2022-12-14 14:14:32
  * @LastEditors: code4eat awesomedema@gmail.com
- * @LastEditTime: 2023-06-15 14:52:07
+ * @LastEditTime: 2023-06-19 10:22:31
  * @FilePath: /BudgetManaSystem/.umirc.ts
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -25,9 +25,7 @@ export default defineConfig({
   },
   mfsu: {},
   lessLoader: {
-    modifyVars: { '@ant-prefix': 'bms-ant','root-entry-name': 'default' },
-    // javascriptEnabled:true,
-  
+    modifyVars: { '@ant-prefix': 'bms-ant'},  
   }, //对应修改生成的 antd 样式类名
   access: {},
   model: {},

+ 2 - 2
src/app.tsx

@@ -2,7 +2,7 @@
  * @Author: code4eat awesomedema@gmail.com
  * @Date: 2022-12-14 14:14:32
  * @LastEditors: code4eat awesomedema@gmail.com
- * @LastEditTime: 2023-06-15 15:01:03
+ * @LastEditTime: 2023-06-16 11:12:14
  * @FilePath: /BudgetManaSystem/src/app.ts
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -379,7 +379,7 @@ export const layout = ({ initialState, setInitialState }: { initialState: any, s
         colorTextMenuSelected: '#3376FE',
         colorTextMenuTitle: '#17181A',
         colorTextMenu: '#17181A',
-        // // colorBgMenuItemHover:'##f0f2f5',
+        //colorBgMenuItemHover:'##f0f2f5',
         colorBgMenuItemSelected: '#F2F6FF',
 
         // colorBgMenuItemCollapsedHover:'#f0f2f5',

+ 17 - 2
src/components/BMSTable/style.less

@@ -3,12 +3,22 @@
 
 .bms-ant-table-wrapper {
     border-radius: 4px !important;
-
+    table {
+        border-radius: 4px !important;
+    }
+    .bms-ant-table-container {
+        border-start-start-radius:4px !important;
+        border-start-end-radius:4px !important;
+    }
     .bms-ant-table-row-indent+.bms-ant-table-row-expand-icon {
         margin-top: -2px !important;
     }
 }
 
+.bms-ant-table .bms-ant-table-header {
+    border-radius: 4px !important;
+}
+
 .bms-ant-table-wrapper .bms-ant-table-tbody >tr >td {
     border-top: 1px solid rgb(218 226 242) !important;
 }
@@ -43,6 +53,7 @@
             padding: 9px 16px !important;
             //border-top:1px solid #dae2f2 !important ;
             background: rgb(238 243 250 / 100%) !important;
+            border-right: 1px solid  #dae2f2 !important;
 
             .bms-ant-table-selection {
                   .bms-ant-table-selection-extra {
@@ -57,6 +68,10 @@
             &:hover {
                 background: rgb(238 243 250 / 100%) !important;
             }
+
+            &:last-child {
+                border-right: none;
+            }
         }
 
         .bms-ant-table-cell-fix-right {
@@ -111,7 +126,7 @@
 
     
     .bms-ant-pagination {
-        padding: 8px 0;
+        padding: 7px 0;
         margin:0 !important;
         border-top: 1px solid #dae2f2 !important;
         .bms-ant-pagination-item-active {

+ 21 - 1
src/global.less

@@ -1,5 +1,20 @@
 * {
-    font-family: 'SourceHanSansCN, SourceHanSansCN' !important;
+    font-family: 'SourceHanSansCN, SourceHanSansCN';
+}
+
+/* Safari */
+@media screen and (-webkit-min-device-pixel-ratio:0)
+{
+  * {
+    margin: 0;
+    padding: 0;
+    font-family:system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif !important;
+  }
+  #password {
+    &::placeholder {
+      font-family:system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif !important;
+    }
+  }
 }
 
 body {
@@ -145,6 +160,7 @@ textarea {
                     flex-direction: row;
                     align-items: center;
                     justify-content: flex-end;
+                    margin-top: 16px;
 
                     &>button {
                         display: flex;
@@ -300,6 +316,10 @@ textarea {
 }
 
 
+
+.bms-ant-menu-item-selected {
+    background-color:#F2F6FF !important;
+}
 .bms-ant-menu-light:not(.bms-ant-menu-horizontal) .bms-ant-menu-item:not(.bms-ant-menu-item-selected):hover {
     background-color: #f0f2f5 !important;
 }

+ 2 - 2
src/pages/budgetMana/monthlyInfoCheck/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-06-15 17:30:06
+ * @LastEditTime: 2023-06-16 13:36:05
  * @FilePath: /BudgetManaSystem/src/pages/budgetMana/monthlySet/index.tsx
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -438,7 +438,7 @@ const MonthlyInfoCheck: React.FC = () => {
                             size="small"
                             bordered={false}
                             rowKey={'empNo'}
-                            pagination={{showTitle:false,pageSize:9,showLessItems:false,simple:true,}}
+                            pagination={{showTitle:false,pageSize:9,showLessItems:false,simple:true,showTotal:()=>false}}
                             tableAlertRender={false}
                             style={{ pointerEvents: listDisabled ? 'none' : undefined }}
                             onRow={({ empNo, disabled: itemDisabled }) => ({

+ 2 - 2
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-06-15 17:39:10
+ * @LastEditTime: 2023-06-16 13:39:07
  * @FilePath: /BudgetManaSystem/src/pages/budgetMana/monthlySet/index.tsx
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -345,7 +345,7 @@ const EmployeeInfoCheck: React.FC = () => {
                             size="small"
                             bordered={false}
                             rowKey={'empNo'}
-                            pagination={{ showTitle: false, pageSize:9, showLessItems: false, simple: true}}
+                            pagination={{ showTitle: false, pageSize:9, showLessItems: false, simple: true,showTotal:()=>false}}
                             tableAlertRender={false}
                             style={{ pointerEvents: listDisabled ? 'none' : undefined }}
                             onRow={({ empNo, disabled: itemDisabled }) => ({

+ 3 - 1
src/pages/setting/baseSetting/positionLevelRateSet/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-06-15 17:45:39
+ * @LastEditTime: 2023-06-15 18:28:33
  * @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
  */
@@ -96,6 +96,7 @@ export default function PositionLevelRateSet() {
             title: '岗位名称',
             dataIndex: 'name',
             key: 'name',
+            ellipsis:true
 
         },
         {
@@ -118,6 +119,7 @@ export default function PositionLevelRateSet() {
             width: 750,
             okText: '确定',
             cancelText: '取消',
+            centered:true,
             content: <TableTransfer
                 ref={ref}
                 record={record}

+ 2 - 1
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-06-15 17:53:41
+ * @LastEditTime: 2023-06-19 14:56:54
  * @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
  */
@@ -197,6 +197,7 @@ export default function BilingProjectMana() {
                     name="orderPointValue"
                     label="点值:"
                     placeholder="请输入"
+                    min={-100000000000}
                 />
                 <ProFormTextArea
                     name="sql"