dingxin 5 gadus atpakaļ
vecāks
revīzija
f74a45ce3c

+ 1
- 1
src/pages/activity/SignList.jsx Parādīt failu

166
         </Form.Item>
166
         </Form.Item>
167
       </Form>
167
       </Form>
168
       <Button type="primary" className={styles.addBtn} onClick={toActivityList}>返回</Button>
168
       <Button type="primary" className={styles.addBtn} onClick={toActivityList}>返回</Button>
169
-      <Button type="primary" style={{ marginLeft: '85%' }} onClick={exportHelp}>导出</Button>
169
+      <Button name="admin.activityDynamicEnlist.export.get" noRight={null} type="primary" style={{ marginLeft: '85%' }} onClick={exportHelp}>导出</Button>
170
       <Table dataSource={data.list.data} columns={columns} pagination={false} rowKey="activity"/>
170
       <Table dataSource={data.list.data} columns={columns} pagination={false} rowKey="activity"/>
171
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
171
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
172
         <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} />
172
         <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} />

+ 2
- 2
src/pages/activity/drainage/DrainageList.jsx Parādīt failu

146
               查看详情
146
               查看详情
147
             </span>
147
             </span>
148
           </AuthButton>
148
           </AuthButton>
149
-          <AuthButton name="admin.taDrainageRecord.get" noRight={null}>
149
+          <AuthButton name="admin.taDrainage.id.delete" noRight={null}>
150
             <span style={{ right: '20px', bottom: ' 10px', fontSize: ' 0.106rem', color: '#FF7E48', cursor: 'pointer', marginLeft: 20 }} onClick={deleteDrainage(datas.drainageId)}>
150
             <span style={{ right: '20px', bottom: ' 10px', fontSize: ' 0.106rem', color: '#FF7E48', cursor: 'pointer', marginLeft: 20 }} onClick={deleteDrainage(datas.drainageId)}>
151
               删除
151
               删除
152
             </span>
152
             </span>
328
             </Button>
328
             </Button>
329
           </Form.Item>
329
           </Form.Item>
330
         </Form>
330
         </Form>
331
-        <AuthButton name="admin.buildingDynamic.add.post" noRight={null}>
331
+        <AuthButton name="admin.taDrainage.add.post" noRight={null}>
332
           <Button type="danger" className={styles.addBtn} onClick={showModal}>新增</Button>
332
           <Button type="danger" className={styles.addBtn} onClick={showModal}>新增</Button>
333
         </AuthButton>
333
         </AuthButton>
334
         <Modal
334
         <Modal

+ 3
- 3
src/pages/activity/groupActivity/helpRecord.jsx Parādīt failu

122
           // onOk={() => this.handleOk()}
122
           // onOk={() => this.handleOk()}
123
           onCancel={(e) => this.handleCancel(e)}
123
           onCancel={(e) => this.handleCancel(e)}
124
         >
124
         >
125
-          <Button type="primary" onClick={() => this.exportChildRecord({ ...this.props.visibleData, pageNumber: 1, pageSize: 5 })} style={{ float: 'right', margin: '20px 0', zIndex: 1 }}>
125
+          <Button type="primary" name="admin.taShareChildRecord.export.get" noRight={null} onClick={() => this.exportChildRecord({ ...this.props.visibleData, pageNumber: 1, pageSize: 5 })} style={{ float: 'right', margin: '20px 0', zIndex: 1 }}>
126
             导出
126
             导出
127
           </Button>
127
           </Button>
128
 
128
 
207
           onCancel={(e) => this.handleCancel(e)}
207
           onCancel={(e) => this.handleCancel(e)}
208
         >
208
         >
209
           <div><span>核销码:<input onChange={this.verify.bind(this)}/></span>
209
           <div><span>核销码:<input onChange={this.verify.bind(this)}/></span>
210
-           <Button onClick={() => this.verification()}>立即核销</Button>
210
+           <Button name="admin.taShareRecord.verificate.put" noRight={null} onClick={() => this.verification()}>立即核销</Button>
211
           </div>
211
           </div>
212
         </Modal>
212
         </Modal>
213
       </>
213
       </>
514
             </Button>
514
             </Button>
515
         </Form.Item>
515
         </Form.Item>
516
       </Form>
516
       </Form>
517
-      <Button type="primary" onClick={() => exportRecord()} style={{ float: 'right', margin: '20px 0', zIndex: 1 }}>
517
+      <Button name="admin.taShareRecord.export.get" noRight={null} type="primary" onClick={() => exportRecord()} style={{ float: 'right', margin: '20px 0', zIndex: 1 }}>
518
         导出
518
         导出
519
       </Button>
519
       </Button>
520
 
520
 

+ 25
- 12
src/pages/activity/groupActivity/list.jsx Parādīt failu

98
       align: 'center',
98
       align: 'center',
99
       render: (x, row) => (
99
       render: (x, row) => (
100
         <>
100
         <>
101
+          {row.activityStatus === 0 &&
102
+          <AuthButton name="admin.taShareActivity.finish.put" noRight={null}><span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={endGroupActivity(row)}>结束活动<Icon type="poweroff" className={styles.edit} /></span></AuthButton>
103
+          }
104
+          {row.activityStatus === 0 &&
105
+          <AuthButton name="admin.taShareSuccessRecord.get" noRight={null}>    <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={ getSignList.bind(this, row.groupActivityId)}>拼团记录<Icon type="snippets" className={styles.shoppingCart} /></span></AuthButton>
106
+          }
101
           {row.activityStatus === 0 &&
107
           {row.activityStatus === 0 &&
102
           <AuthButton name="admin.taShareActivity.list.get" noRight={null}>
108
           <AuthButton name="admin.taShareActivity.list.get" noRight={null}>
103
-        
104
-            <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={ getSignList.bind(this, row.groupActivityId)}>拼团记录<Icon type="snippets" className={styles.shoppingCart} /></span>
105
-            <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={endGroupActivity(row)}>结束活动<Icon type="poweroff" className={styles.edit} /></span>
106
             <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topGroupActivity(row, row.weight)}>{ row.weight === 1 ? '取消置顶' : '置顶' }<Icon type="vertical-align-top" className={styles.edit} /></span>
109
             <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topGroupActivity(row, row.weight)}>{ row.weight === 1 ? '取消置顶' : '置顶' }<Icon type="vertical-align-top" className={styles.edit} /></span>
107
             <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={recommendGroupActivity(row)}>{ row.sort === true ? '取消推荐首页' : '推荐首页' }<Icon type="vertical-align-top" className={styles.edit} /></span>
110
             <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={recommendGroupActivity(row)}>{ row.sort === true ? '取消推荐首页' : '推荐首页' }<Icon type="vertical-align-top" className={styles.edit} /></span>
108
         </AuthButton> }
111
         </AuthButton> }
109
 
112
 
110
           {row.activityStatus === 1 &&
113
           {row.activityStatus === 1 &&
111
-           <AuthButton name="admin.taShareActivity.list.get" noRight={null}>
112
-                      <span style={{ color: '#FF925C', cursor: 'pointer' }} onClick={toEditActivity(row.groupActivityId)}>编辑<Icon type="form" className={styles.edit} /></span>
113
-                      <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={endGroupActivity(row)}>结束活动<Icon type="poweroff" className={styles.edit} /></span>
114
-                      <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topGroupActivity(row, row.weight)}>{ row.weight === 1 ? '取消置顶' : '置顶' }<Icon type="vertical-align-top" className={styles.edit} /></span>
115
-            <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={recommendGroupActivity(row)}>{ row.sort === true ? '取消推荐首页' : '推荐首页' }<Icon type="vertical-align-top" className={styles.edit} /></span>
114
+          <AuthButton name="admin.taShareActivity.update.put" noRight={null}>
115
+            <span style={{ color: '#FF925C', cursor: 'pointer' }} onClick={toEditActivity(row.groupActivityId)}>编辑<Icon type="form" className={styles.edit} /></span>
116
+          </AuthButton>
117
+          }
118
+           {row.activityStatus === 1 &&
119
+          <AuthButton name="admin.taShareActivity.finish.put" noRight={null}>
120
+                <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={endGroupActivity(row)}>结束活动<Icon type="poweroff" className={styles.edit} /></span>
121
+          </AuthButton>
122
+          }
123
+           {row.activityStatus === 1 &&
124
+           <AuthButton name="admin.taShareActivity.weight.put" noRight={null}>
125
+                <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topGroupActivity(row, row.weight)}>{ row.weight === 1 ? '取消置顶' : '置顶' }<Icon type="vertical-align-top" className={styles.edit} /></span>
126
+                <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={recommendGroupActivity(row)}>{ row.sort === true ? '取消推荐首页' : '推荐首页' }<Icon type="vertical-align-top" className={styles.edit} /></span>
116
         </AuthButton>
127
         </AuthButton>
117
           }
128
           }
118
 
129
 
119
-          {row.activityStatus === 2 &&
120
-        <AuthButton name="admin.taShareActivity.list.get" noRight={null}>
121
-           <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={ getSignList.bind(this, row.groupActivityId)}>拼团记录<Icon type="snippets" className={styles.shoppingCart} /></span>
122
-           <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topGroupActivity(row, row.weight)}>{ row.weight === 1 ? '取消置顶' : '置顶' }<Icon type="vertical-align-top" className={styles.edit} /></span>
130
+        {row.activityStatus === 2 &&
131
+        <AuthButton><span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={ getSignList.bind(this, row.groupActivityId)}>拼团记录<Icon type="snippets" className={styles.shoppingCart} /></span></AuthButton>
132
+        }
133
+         {row.activityStatus === 2 &&
134
+        <AuthButton name="admin.taShareActivity.weight.put" noRight={null}>
135
+            <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topGroupActivity(row, row.weight)}>{ row.weight === 1 ? '取消置顶' : '置顶' }<Icon type="vertical-align-top" className={styles.edit} /></span>
123
             <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={recommendGroupActivity(row)}>{ row.sort === true ? '取消推荐首页' : '推荐首页' }<Icon type="vertical-align-top" className={styles.edit} /></span>
136
             <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={recommendGroupActivity(row)}>{ row.sort === true ? '取消推荐首页' : '推荐首页' }<Icon type="vertical-align-top" className={styles.edit} /></span>
124
         </AuthButton>
137
         </AuthButton>
125
           }
138
           }

+ 3
- 3
src/pages/activity/helpActivity/helpRecord.jsx Parādīt failu

127
           onCancel={e => this.handleCancel(e)}
127
           onCancel={e => this.handleCancel(e)}
128
         >
128
         >
129
 
129
 
130
-      <Button type="primary" onClick={() => this.exportHelp()} style={{ float: 'right', margin: '20px 0', zIndex: 1 }}>
130
+      <Button name="admin.HelpInitiateRecordSucceed.export.get" noRight={null} type="primary" onClick={() => this.exportHelp()} style={{ float: 'right', margin: '20px 0', zIndex: 1 }}>
131
         导出
131
         导出
132
       </Button>
132
       </Button>
133
           <Table rowKey="independent" dataSource={this.state.dataSource.records} columns={columns} pagination={{ total: this.state.dataSource.total, onChange: e => this.onChange(e) }} />
133
           <Table rowKey="independent" dataSource={this.state.dataSource.records} columns={columns} pagination={{ total: this.state.dataSource.total, onChange: e => this.onChange(e) }} />
218
           onCancel={e => this.handleCancel(e)}
218
           onCancel={e => this.handleCancel(e)}
219
         >
219
         >
220
           <div><span>核销码:<input onChange={this.verify.bind(this)}/></span>
220
           <div><span>核销码:<input onChange={this.verify.bind(this)}/></span>
221
-           <Button onClick={e => this.verification(e)} style={{ marginLeft: '80px' }}>立即核销</Button>
221
+           <Button name="admin.helpInitiateRecordVerify.post" noRight={null} onClick={e => this.verification(e)} style={{ marginLeft: '80px' }}>立即核销</Button>
222
           </div>
222
           </div>
223
         </Modal>
223
         </Modal>
224
       </>
224
       </>
516
             </Button>
516
             </Button>
517
         </Form.Item>
517
         </Form.Item>
518
       </Form>
518
       </Form>
519
-      <Button type="primary" onClick={() => exportCustomer()} style={{ float: 'right', margin: '20px 0', zIndex: 1 }}>
519
+      <Button name="admin.helpRecord.export.get" noRight={null} type="primary" onClick={() => exportCustomer()} style={{ float: 'right', margin: '20px 0', zIndex: 1 }}>
520
         导出
520
         导出
521
       </Button>
521
       </Button>
522
 
522
 

+ 18
- 9
src/pages/activity/helpActivity/list.jsx Parādīt failu

92
       render: (x, row) => (
92
       render: (x, row) => (
93
         <>
93
         <>
94
           {row.activityStatus === 0 &&
94
           {row.activityStatus === 0 &&
95
-          <AuthButton name="admin.SignList.get" noRight={null}>
96
-        
97
-            <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={ getSignList.bind(this, row.helpActivityId)}>助力记录<Icon type="snippets" className={styles.shoppingCart} /></span>
95
+          <AuthButton name="admin.helpRecord.get">
96
+             <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={ getSignList.bind(this, row.helpActivityId)}>助力记录<Icon type="snippets" className={styles.shoppingCart} /></span>
97
+          </AuthButton>}
98
+          {row.activityStatus === 0 &&
99
+          <AuthButton name="admin.top.update.post" noRight={null}>
98
             <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={topDynamic(row, 2)}>结束活动<Icon type="poweroff" className={styles.edit} /></span>
100
             <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={topDynamic(row, 2)}>结束活动<Icon type="poweroff" className={styles.edit} /></span>
99
             <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topDynamic(row, 0)}>{ row.weight === 1 ? '取消置顶' : '置顶' }<Icon type="vertical-align-top" className={styles.edit} /></span>
101
             <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topDynamic(row, 0)}>{ row.weight === 1 ? '取消置顶' : '置顶' }<Icon type="vertical-align-top" className={styles.edit} /></span>
100
             <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topDynamic(row, 1)}>{ row.isMain === true ? '取消推首页' : '推首页' }<Icon type="vertical-align-top" className={styles.edit} /></span>
102
             <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topDynamic(row, 1)}>{ row.isMain === true ? '取消推首页' : '推首页' }<Icon type="vertical-align-top" className={styles.edit} /></span>
101
           </AuthButton> }
103
           </AuthButton> }
102
 
104
 
103
           {row.activityStatus === 1 &&
105
           {row.activityStatus === 1 &&
104
-           <AuthButton name="admin.buildingDynamic.finish.put" noRight={null}>
105
-                      <span style={{ color: '#FF925C', cursor: 'pointer' }} onClick={toEditGoods(row.helpActivityId)}>编辑<Icon type="form" className={styles.edit} /></span>
106
-                      {/* <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={topDynamic(row, 2)}>结束活动<Icon type="poweroff" className={styles.edit} /></span> */}
106
+          <AuthButton name="admin.helpActivity.update.put" noRight={null}>
107
+            <span style={{ color: '#FF925C', cursor: 'pointer' }} onClick={toEditGoods(row.helpActivityId)}>编辑<Icon type="form" className={styles.edit} /></span>
108
+          </AuthButton>
109
+          }
110
+          {row.activityStatus === 1 &&
111
+           <AuthButton name="admin.top.update.post" noRight={null}>
107
             <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topDynamic(row, 0)}>{ row.weight === 1 ? '取消置顶' : '置顶' }<Icon type="vertical-align-top" className={styles.edit} /></span>
112
             <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topDynamic(row, 0)}>{ row.weight === 1 ? '取消置顶' : '置顶' }<Icon type="vertical-align-top" className={styles.edit} /></span>
108
             <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topDynamic(row, 1)}>{ row.isMain === true ? '取消推首页' : '推首页' }<Icon type="vertical-align-top" className={styles.edit} /></span>
113
             <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topDynamic(row, 1)}>{ row.isMain === true ? '取消推首页' : '推首页' }<Icon type="vertical-align-top" className={styles.edit} /></span>
109
             </AuthButton>
114
             </AuthButton>
110
           }
115
           }
111
 
116
 
112
           {row.activityStatus === 2 &&
117
           {row.activityStatus === 2 &&
113
-        <AuthButton name="admin.buildingDynamic.finish.put" noRight={null}>
114
-           <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={ getSignList.bind(this, row.helpActivityId)}>助力记录<Icon type="snippets" className={styles.shoppingCart} /></span>
118
+          <AuthButton name="admin.helpRecord.get" noRight={null}>
119
+            <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={ getSignList.bind(this, row.helpActivityId)}>助力记录<Icon type="snippets" className={styles.shoppingCart} /></span>
120
+          </AuthButton>
121
+          }
122
+           {row.activityStatus === 2 &&
123
+        <AuthButton name="admin.top.update.post" noRight={null}>
115
            <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topDynamic(row, 0)}>{ row.weight === 1 ? '取消置顶' : '置顶' }<Icon type="vertical-align-top" className={styles.edit} /></span>
124
            <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topDynamic(row, 0)}>{ row.weight === 1 ? '取消置顶' : '置顶' }<Icon type="vertical-align-top" className={styles.edit} /></span>
116
             <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topDynamic(row, 1)}>{ row.isMain === true ? '取消推首页' : '推首页' }<Icon type="vertical-align-top" className={styles.edit} /></span>
125
             <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topDynamic(row, 1)}>{ row.isMain === true ? '取消推首页' : '推首页' }<Icon type="vertical-align-top" className={styles.edit} /></span>
117
         </AuthButton>
126
         </AuthButton>
266
         </Form.Item>
275
         </Form.Item>
267
       </Form>
276
       </Form>
268
       <AuthButton name="admin.buildingDynamic.add.post" noRight={null}>
277
       <AuthButton name="admin.buildingDynamic.add.post" noRight={null}>
269
-        <Button type="danger" className={styles.addBtn} onClick={toEditGoods()}>新增</Button>
278
+        <Button name="admin.helpActivity.add.post" noRight={null} type="danger" className={styles.addBtn} onClick={toEditGoods()}>新增</Button>
270
       </AuthButton>
279
       </AuthButton>
271
       <Table dataSource={data.records} columns={columns} pagination={false} rowKey="activityList"/>
280
       <Table dataSource={data.records} columns={columns} pagination={false} rowKey="activityList"/>
272
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
281
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>

+ 1
- 1
src/services/apis.js Parādīt failu

439
       getTaActivityDynamicEnlistExport: {
439
       getTaActivityDynamicEnlistExport: {
440
         url: `${prefix}/activityDynamicEnlist/export`,
440
         url: `${prefix}/activityDynamicEnlist/export`,
441
         method: 'GET',
441
         method: 'GET',
442
-        action: 'admin.SignList.get',
442
+        action: 'admin.activityDynamicEnlist.export.get',
443
       },
443
       },
444
       taDrainage: {
444
       taDrainage: {
445
         url: `${prefix}/taDrainage`,
445
         url: `${prefix}/taDrainage`,