zlisen 3 years ago
parent
commit
73bde17c23

+ 7
- 6
config/routes.js View File

486
               },
486
               },
487
             ],
487
             ],
488
           },
488
           },
489
+         
489
           {
490
           {
490
-            path: '/',
491
+            path: '/system',
491
             name: '系统管理',
492
             name: '系统管理',
492
             component: '../layouts/BlankLayout',
493
             component: '../layouts/BlankLayout',
493
             routes: [
494
             routes: [
497
                 component: './system/intention',
498
                 component: './system/intention',
498
               },
499
               },
499
               {
500
               {
500
-                path: '/staff/Staff/List',
501
+                path: '/system/Staff/List',
501
                 name: '员工列表',
502
                 name: '员工列表',
502
                 component: './staff/Staff/List',
503
                 component: './staff/Staff/List',
503
               },
504
               },
504
               {
505
               {
505
-                path: '/staff/Staff/Edit',
506
+                path: '/system/Staff/Edit',
506
                 name: '编辑员工',
507
                 name: '编辑员工',
507
                 hideInMenu: true,
508
                 hideInMenu: true,
508
                 component: './staff/Staff/Edit',
509
                 component: './staff/Staff/Edit',
509
               },
510
               },
510
               {
511
               {
511
-                path: '/staff/Role/List',
512
+                path: '/system/Role/List',
512
                 name: '角色管理',
513
                 name: '角色管理',
513
                 component: './staff/Role/List',
514
                 component: './staff/Role/List',
514
               },
515
               },
515
               {
516
               {
516
-                path: '/staff/Role/Edit',
517
+                path: '/system/Role/Edit',
517
                 name: '编辑角色',
518
                 name: '编辑角色',
518
                 hideInMenu: true,
519
                 hideInMenu: true,
519
                 component: './staff/Role/Edit',
520
                 component: './staff/Role/Edit',
520
               },
521
               },
521
               {
522
               {
522
-                path: '/staff/Organization/List',
523
+                path: '/system/Organization/List',
523
                 name: '组织架构',
524
                 name: '组织架构',
524
                 component: './staff/Organization',
525
                 component: './staff/Organization',
525
               },
526
               },

+ 3
- 4
src/pages/Live/LiveActivity/Edit/components/base.jsx View File

55
   };
55
   };
56
 
56
 
57
   const cancelPage = () => {
57
   const cancelPage = () => {
58
-    router.push({
59
-      pathname: '/activity/liveActivity/list/index',
60
-    });
58
+    router.go('-1')
61
   };
59
   };
62
 
60
 
63
   //打开新页面
61
   //打开新页面
120
         <Form.Item label="所属城市">
118
         <Form.Item label="所属城市">
121
           {getFieldDecorator('cityId', {
119
           {getFieldDecorator('cityId', {
122
             initialValue: liveActivityData.cityId,
120
             initialValue: liveActivityData.cityId,
123
-            rules: [{ required: true, message: ' 请输入所属城市' }],
121
+            rules: [{ required: true, message: ' 请选择所属城市' }],
124
           })(<CitySelect3 buildingId={props.form.getFieldValue('buildingId')} />)}
122
           })(<CitySelect3 buildingId={props.form.getFieldValue('buildingId')} />)}
125
         </Form.Item>
123
         </Form.Item>
126
         <Form.Item label="所属楼盘">
124
         <Form.Item label="所属楼盘">
127
           {getFieldDecorator('buildingId', {
125
           {getFieldDecorator('buildingId', {
128
             initialValue: liveActivityData.buildingId,
126
             initialValue: liveActivityData.buildingId,
127
+            rules: [{ required: true, message: ' 请选择所属楼盘' }],
129
           })(<BuildSelect2 cityId={props.form.getFieldValue('cityId')} />)}
128
           })(<BuildSelect2 cityId={props.form.getFieldValue('cityId')} />)}
130
         </Form.Item>
129
         </Form.Item>
131
         <Form.Item label="直播活动标题">
130
         <Form.Item label="直播活动标题">

+ 4
- 2
src/pages/Live/LiveActivity/add/index.jsx View File

81
       <Form labelCol={{ span: 7 }} wrapperCol={{ span: 12 }} onSubmit={handleSubmit}>
81
       <Form labelCol={{ span: 7 }} wrapperCol={{ span: 12 }} onSubmit={handleSubmit}>
82
         <Form.Item label="所属城市">
82
         <Form.Item label="所属城市">
83
           {getFieldDecorator('cityId', {
83
           {getFieldDecorator('cityId', {
84
-            rules: [{ required: true, message: ' 请输入所属城市' }],
84
+            rules: [{ required: true, message: ' 请选择所属城市' }],
85
           })(<CitySelect3 buildingId={props.form.getFieldValue('buildingId')}/>)}
85
           })(<CitySelect3 buildingId={props.form.getFieldValue('buildingId')}/>)}
86
         </Form.Item>
86
         </Form.Item>
87
         <Form.Item label="所属楼盘">
87
         <Form.Item label="所属楼盘">
88
-          {getFieldDecorator('buildingId')(<BuildSelect2 cityId={props.form.getFieldValue('cityId')}/>)}
88
+          {getFieldDecorator('buildingId', {
89
+            rules: [{ required: true, message: ' 请选择所属楼盘' }],
90
+          })(<BuildSelect2 cityId={props.form.getFieldValue('cityId')}/>)}
89
         </Form.Item>
91
         </Form.Item>
90
         <Form.Item label="直播活动标题">
92
         <Form.Item label="直播活动标题">
91
           {getFieldDecorator('liveActivityTitle', {
93
           {getFieldDecorator('liveActivityTitle', {

+ 3
- 1
src/pages/building/Edit/Basic/index.jsx View File

130
           {getFieldDecorator('buildingId')(<Input disabled />)}
130
           {getFieldDecorator('buildingId')(<Input disabled />)}
131
         </Item>
131
         </Item>
132
         <Item label="城市公司">
132
         <Item label="城市公司">
133
-          {getFieldDecorator('institutionId')(
133
+          {getFieldDecorator('institutionId',{
134
+            rules: [{ required: true, message: '请选择城市公司号' }],
135
+          })(
134
             <InstitutionSelect />
136
             <InstitutionSelect />
135
           )}
137
           )}
136
         </Item>
138
         </Item>

+ 2
- 2
src/pages/staff/Role/List/index.jsx View File

25
 
25
 
26
   function addRole(roleId) {
26
   function addRole(roleId) {
27
     router.push({
27
     router.push({
28
-      pathname: '/staff/Role/Edit',
28
+      pathname: '/system/Role/Edit',
29
     });
29
     });
30
   }
30
   }
31
 
31
 
32
   function toEditRole(roleId) {
32
   function toEditRole(roleId) {
33
     router.push({
33
     router.push({
34
-      pathname: '/staff/Role/Edit',
34
+      pathname: '/system/Role/Edit',
35
       query: {
35
       query: {
36
         id: roleId,
36
         id: roleId,
37
       },
37
       },

+ 3
- 1
src/pages/staff/staff/Edit/index.jsx View File

70
   }, []);
70
   }, []);
71
 
71
 
72
   const handleSubmit = val => {
72
   const handleSubmit = val => {
73
-    val.institutionIdLis =  val.institutionIdLis?.split(',')
73
+    console.log(val,userId,'----------111------------')
74
+    // val.institutionIdLis =  val?.institutionIdLis?.split(',')
75
+    // console.log(val,userId,'----------------------')
74
     if (userId) {
76
     if (userId) {
75
       request({ ...apis.staff.updateTaUser, urlData: { id: userId }, data: val })
77
       request({ ...apis.staff.updateTaUser, urlData: { id: userId }, data: val })
76
         .then(data => {
78
         .then(data => {

+ 1
- 1
src/pages/staff/staff/list/index.jsx View File

19
   const toEdit = useCallback(row => {
19
   const toEdit = useCallback(row => {
20
     //跳转到编辑商品
20
     //跳转到编辑商品
21
     router.push({
21
     router.push({
22
-      pathname: '/staff/Staff/Edit',
22
+      pathname: '/system/Staff/Edit',
23
       query: {
23
       query: {
24
         userId: row?.userId || undefined,
24
         userId: row?.userId || undefined,
25
       },
25
       },

+ 2
- 2
src/pages/statistics/activity/index.jsx View File

119
       <Table
119
       <Table
120
         columns={columns}
120
         columns={columns}
121
         dataSource={data?.records}
121
         dataSource={data?.records}
122
-        key="ff87cf95ed63367168bcb081c15d9d5e"
123
-        pagination={{current:data?.current, pageSize: '10', total: data?.total }}
122
+        key="dynamicId"
123
+        pagination={{current:data?.current, pageSize: 10, total: data?.total }}
124
         onChange={handleTableChange}
124
         onChange={handleTableChange}
125
       ></Table>
125
       ></Table>
126
     </Card>
126
     </Card>