code4eat 3 жил өмнө
parent
commit
e61f70f52b

+ 3 - 2
src/pages/UserMana/index.js

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-07-26 10:13:13
- * @LastEditTime: 2021-09-10 09:24:49
+ * @LastEditTime: 2021-09-18 11:36:21
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /TracerMethodology_PC/src/pages/UserMana/index.js
@@ -208,7 +208,7 @@ const UserMana = () => {
           name="account"
         />
         <ProFormText
-          label="密码不修改留空"
+          label="密码"
           rules={[
             {
               required: false,
@@ -217,6 +217,7 @@ const UserMana = () => {
           ]}
           width="sm"
           name="password"
+          placeholder='密码不修改留空'
         />
         <ProFormSelect
           options={[

+ 3 - 3
src/pages/accountingSubjectConnect/index.jsx

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-07-26 10:13:13
- * @LastEditTime: 2021-09-10 09:10:34
+ * @LastEditTime: 2021-09-18 11:33:04
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /TracerMethodology_PC/src/pages/UserMana/index.js
@@ -80,7 +80,7 @@ const AccountingSubjectConnect = () => {
       hideInSearch: true,
     },
     {
-      title: '成本中心名称',
+      title: '成本收入项目',
       dataIndex: 'name',
       key: 'name',
       ellipsis: true,
@@ -185,7 +185,7 @@ const AccountingSubjectConnect = () => {
 
       />
       <DrawerForm
-        title="可绑定成本中心列表"
+        title="可绑定成本收入项目"
         formRef={drawerFormRef}
         visible={drawerVisible}
         onVisibleChange={(visible) => drawerVisibleChange(visible)}

+ 5 - 2
src/pages/baseSetting/reportProjectSetting/index.js

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-07-26 10:13:13
- * @LastEditTime: 2021-09-10 09:12:58
+ * @LastEditTime: 2021-09-18 11:44:42
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /TracerMethodology_PC/src/pages/UserMana/index.js
@@ -50,7 +50,8 @@ const ReportProjectSetting = () => {
       dataIndex: 'reportName',
       key: 'reportName',
       hideInSearch: true,
-      ellipsis: true,
+      width:'15%'
+      // ellipsis: true,
     },
     {
       title: 'Id',
@@ -125,6 +126,7 @@ const ReportProjectSetting = () => {
       key: 'sort',
       ellipsis: true,
       hideInSearch: true,
+      width:'5%'
     },
     {
       title: '比率基数',
@@ -137,6 +139,7 @@ const ReportProjectSetting = () => {
       title: '操作',
       dataIndex: 'option',
       valueType: 'option',
+      width:'15%',
       render: (_, record) => {
         const { showAddRelation, parentId } = record;
         const btnGroup = [

+ 0 - 1
src/pages/costAccounting/afterCostShareSearch/index.jsx

@@ -16,7 +16,6 @@ import { PageContainer } from '@ant-design/pro-layout';
 import ProTable from '@ant-design/pro-table';
 import {
   ProFormDatePicker,
-  ProFormSelect,
 } from '@ant-design/pro-form';
 import { getAfterCostShareSearchList, getAfterCostShareSearchTableData } from './service';
 import { getResponsibilityCenterList } from '@/pages/responsibilityCenter/service';

+ 2 - 1
src/pages/costAccounting/incomeCostDataImport/index.jsx

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-07-26 10:13:13
- * @LastEditTime: 2021-09-10 09:18:24
+ * @LastEditTime: 2021-09-18 11:38:50
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /TracerMethodology_PC/src/pages/UserMana/index.js
@@ -63,6 +63,7 @@ const IncomeCostDataImport = () => {
       dataIndex: 'fileName',
       key: 'fileName',
       ellipsis: true,
+      width:'20%'
     },
     {
       title: '所属年月',

+ 2 - 2
src/pages/costAllocationParamsSetting/index.jsx

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-07-26 10:13:13
- * @LastEditTime: 2021-09-10 09:20:52
+ * @LastEditTime: 2021-09-18 11:32:02
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /TracerMethodology_PC/src/pages/UserMana/index.js
@@ -318,7 +318,7 @@ const CostAllocationParamsSetting = () => {
                 },
                 tabList:[
                   {
-                    tab: '收',
+                    tab: '收',
                     key: 1,
                   },
                   {

+ 2 - 2
src/pages/platformMana/menuManage/index.js

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-07-26 10:13:13
- * @LastEditTime: 2021-09-10 09:22:16
+ * @LastEditTime: 2021-09-18 11:40:14
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /TracerMethodology_PC/src/pages/UserMana/index.js
@@ -24,7 +24,7 @@ const UserMana = () => {
       title: '菜单名称',
       dataIndex: 'name',
       key: 'name',
-      ellipsis: true,
+      // ellipsis: true,
     },
     {
       title: '菜单Id',

+ 2 - 2
src/pages/responsibilityCenterConnect/index.jsx

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-07-26 10:13:13
- * @LastEditTime: 2021-09-10 09:24:25
+ * @LastEditTime: 2021-09-18 11:46:14
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /TracerMethodology_PC/src/pages/UserMana/index.js
@@ -25,7 +25,7 @@ const ResponsibilityCenterConnect = () => {
       key: 'responsibilityName',
       hideInSearch: false,
       width: '20%',
-      ellipsis: true,
+      // ellipsis: true,
     },
     {
       title: '责任中心Id',