周立森 пре 5 година
родитељ
комит
92696a51b5

+ 2
- 2
src/pages/activity/groupActivity/helpRecord.jsx Прегледај датотеку

@@ -171,6 +171,7 @@ class Verifier extends React.Component {
171 171
    getVerCodeList (params) {
172 172
     request({ ...apis.groupActivity.verification, params: { ...params } }).then(res => {
173 173
       message.info('核销成功')
174
+      this.props.onSuccess({groupActivityId: this.state.visibleData.groupActivityId, groupStatus: 0});
174 175
     }).catch(err => {
175 176
       <Alert
176 177
         style={{
@@ -191,7 +192,6 @@ class Verifier extends React.Component {
191 192
   verification(e) {
192 193
     console.log("asdasdasdasd",this.state.visibleData);
193 194
     this.getVerCodeList({ groupActivityId: this.state.visibleData.groupActivityId, verifyCode: this.state.visibleData.verificationCode, recordId: this.state.visibleData.recordId})
194
-    this.props.onSuccess({groupActivityId: this.state.visibleData.groupActivityId, groupStatus: 0});
195 195
   }
196 196
 
197 197
   render () {
@@ -207,7 +207,7 @@ class Verifier extends React.Component {
207 207
           onCancel={(e) => this.handleCancel(e)}
208 208
         >
209 209
           <div><span>核销码:<input onChange={this.verify.bind(this)}/></span>
210
-           <Button name="admin.taShareRecord.verificate.put" noRight={null} onClick={() => this.verification()}>立即核销</Button>
210
+           <Button name="admin.taShareRecord.verificate.put" noRight={null} style={{ marginLeft: '80px' }} onClick={() => this.verification()}>立即核销</Button>
211 211
           </div>
212 212
         </Modal>
213 213
       </>

+ 1
- 1
src/pages/activity/helpActivity/helpRecord.jsx Прегледај датотеку

@@ -181,6 +181,7 @@ class Verifier extends React.Component {
181 181
     request({ ...apis.helpActivity.verification, params: { ...params } }).then(res => {
182 182
       // eslint-disable-next-line no-undef
183 183
       message.info('核销成功')
184
+      this.props.onSuccess({ pageNumber: 1, pageSize: 10, helpActivityId: this.props.visibleData.helpActivityId, status: 'helpSucceed' })
184 185
     }).catch(err => {
185 186
       // eslint-disable-next-line no-unused-expressions
186 187
       <Alert
@@ -202,7 +203,6 @@ class Verifier extends React.Component {
202 203
   // eslint-disable-next-line class-methods-use-this
203 204
   verification(e) {
204 205
     this.audit({ helpRecordInitiateId: this.state.visibleData.helpId, verifyCode: this.state.visibleData.verificationCode })
205
-    this.props.onSuccess({ pageNumber: 1, pageSize: 10, helpActivityId: this.props.visibleData.helpActivityId, status: 'helpSucceed' })
206 206
   }
207 207
 
208 208
   render () {

+ 2
- 2
src/pages/building/list/add/components/imageSet.jsx Прегледај датотеку

@@ -85,9 +85,9 @@ function imageSet(props) {
85 85
     // 网路请求
86 86
     request({ ...apis.building.buildingApartmentDelete, urlData: { id: record.apartmentId } }).then(res => {
87 87
       getList()
88
-      openNotificationWithIcon('error', '操作成功')
88
+      openNotificationWithIcon('success', '操作成功')
89 89
     }).catch(err => {
90
-      openNotificationWithIcon('error', err.message)
90
+      // openNotificationWithIcon('error', err.message)
91 91
     })
92 92
   }
93 93
 

+ 9
- 3
src/pages/building/list/add/components/modalImage.jsx Прегледај датотеку

@@ -163,10 +163,14 @@ class ModalImage extends React.Component {
163 163
                   {getFieldDecorator('apartmentId')(<Input />)}
164 164
               </Form.Item>
165 165
               <Form.Item label="名称">
166
-                {getFieldDecorator('apartmentName')(<Input />)}
166
+                {getFieldDecorator('apartmentName', {
167
+                  rules: [{ required: true, message: '请输入名称' }],
168
+                })(<Input />)}
167 169
               </Form.Item>
168 170
               <Form.Item label="类型">
169
-                {getFieldDecorator('apartmentType')(
171
+                {getFieldDecorator('apartmentType', {
172
+                  rules: [{ required: true, message: '请选择类型' }],
173
+                })(
170 174
                   <Select placeholder="类型">
171 175
                     <Option value="apart">户型</Option>
172 176
                     <Option value="photo">相册</Option>
@@ -183,7 +187,9 @@ class ModalImage extends React.Component {
183 187
                 )}
184 188
               </Form.Item>
185 189
               <Form.Item label="图片">
186
-              {getFieldDecorator('img')(
190
+              {getFieldDecorator('img', {
191
+                  rules: [{ required: true, message: '请选择图片' }],
192
+              })(
187 193
                 <ImageListUpload />,
188 194
               )}
189 195
               </Form.Item>

+ 1
- 1
src/pages/building/list/index.jsx Прегледај датотеку

@@ -122,7 +122,7 @@ function CartBody(props) {
122 122
       <p className={Styles.cardItem}>
123 123
         <span className={Styles.title}>均价</span>
124 124
         <span >
125
-          :约<span style={{ color: '#FF0707', fontSize: '20px' }}> {data.price} </span>元/m
125
+          :约<span style={{ color: '#FF0707', fontSize: '20px' }}> {data.price} </span>元/m²
126 126
         </span>
127 127
       </p>
128 128
       <p className={Styles.cardItem}>

+ 3
- 2
src/pages/building/type/edi.jsx Прегледај датотеку

@@ -59,8 +59,7 @@ function body(props) {
59 59
       openNotificationWithIcon('success', '操作成功')
60 60
       router.go(-1)
61 61
     }).catch(err => {
62
-      // eslint-disable-next-line no-unused-expressions
63
-      openNotificationWithIcon('error', err)
62
+      
64 63
     })
65 64
   }
66 65
 
@@ -76,6 +75,8 @@ function body(props) {
76 75
         // eslint-disable-next-line no-unused-expressions
77 76
         openNotificationWithIcon('success', '操作成功')
78 77
         router.go(-1)
78
+      }).catch(err => {
79
+        
79 80
       })
80 81
     }
81 82
 

+ 8
- 2
src/pages/building/type/index.jsx Прегледај датотеку

@@ -42,6 +42,12 @@ function body() {
42 42
             删除
43 43
             <Icon type="rest" style={{ color: '#C0C4CC', marginLeft: '8px' }} />
44 44
           </Button>
45
+          <Button type="link" style={{
46
+            color: '#FF4A4A', right: '0',
47
+          }} onClick={() => toEdi(record.buildingTypeId)}>
48
+            编辑
49
+            <Icon type="copy" style={{ color: '#C0C4CC', marginLeft: '8px' }} />
50
+          </Button>
45 51
         </span>
46 52
       ),
47 53
     },
@@ -65,7 +71,7 @@ function body() {
65 71
       setData(res)
66 72
     }).catch(err => {
67 73
       // eslint-disable-next-line no-unused-expressions
68
-      openNotificationWithIcon('error', err)
74
+      // openNotificationWithIcon('error', err)
69 75
     })
70 76
   }
71 77
 
@@ -84,7 +90,7 @@ function body() {
84 90
     }).then(() => {
85 91
       openNotificationWithIcon('success', '操作成功')
86 92
     }).catch(err => {
87
-      //openNotificationWithIcon('error', err.message)
93
+      // openNotificationWithIcon('error', err.message)
88 94
     })
89 95
   }
90 96
 

+ 2
- 1
src/pages/integralMall/GoodsList.jsx Прегледај датотеку

@@ -43,6 +43,7 @@ function header(props) {
43 43
 
44 44
   function handleReset() {
45 45
     props.form.resetFields();
46
+    getList({ pageNum: 1, pageSize: 10 });
46 47
   }
47 48
 
48 49
   // 跳转到编辑商品
@@ -64,7 +65,7 @@ function header(props) {
64 65
       onOk() {
65 66
         request({ ...apis.integralMall.changeTaGoods, data: { ...row },}).then((data) => {
66 67
           message.info('操作成功!')
67
-          getList({ pageNum: 1, pageSize: 10 });
68
+          getList({ pageNum: 1, pageSize: 10, ...props.form.getFieldsValue() });
68 69
         })
69 70
       }
70 71
     });

+ 7
- 11
src/pages/staff/list/StaffList.jsx Прегледај датотеку

@@ -104,9 +104,7 @@ const CartBody = (props) => {
104 104
 }
105 105
 
106 106
 const header = (props) => {
107
-  const [tempData, setTempData] = useState([])
108
-  const [pageTotal, setPageTotal] = useState('')
109
-  const [data,setData] = useState({})
107
+  const [tempData, setTempData] = useState({ records: [] })
110 108
   useEffect(() => {
111 109
     getList({ pageNum: 1, pageSize: 8 });
112 110
   }, [])
@@ -114,9 +112,7 @@ const header = (props) => {
114 112
   const getList = (params) => {
115 113
     request({ ...apis.staff.taUser, params: { ...params } }).then((data) => {
116 114
       console.log(data, "listData")
117
-      setData(data)
118
-      setTempData(data.records)
119
-      setPageTotal(data.total)
115
+      setTempData(data)
120 116
     })
121 117
   }
122 118
 
@@ -196,21 +192,21 @@ const header = (props) => {
196 192
       <Button type="danger" style={{ margin: '20px 0', padding: '2px 36px' }} onClick={toEditStaff()}>新增</Button>
197 193
       <Row style={{ padding: ' 0 10px' }}>
198 194
         {
199
-          tempData.map((item, index) => (
195
+          tempData.records.map((item, index) => (
200 196
             <Col span={6}>
201
-              <CartBody data={item} onFresh={() => getList({ pageNum: 1, pageSize: 8 })} />
197
+              <CartBody data={item} onFresh={() => getList({ pageNum: 1, pageSize: 8 })} key={item.userId} />
202 198
             </Col>
203 199
           ))
204 200
         }
205 201
       </Row>
206 202
 
207 203
       {/* 分页  */}
208
-      <div style={{ display: 'flex', justifyContent: 'flex-end' }}>
209
-        <Pagination showQuickJumper defaultCurrent={1} pageSize={8} total={pageTotal} onChange={onChange} current={data.current}/>
204
+      <div style={{ display: 'flex', justifyContent: 'flex-end' }}>     
205
+        <Pagination showQuickJumper defaultCurrent={1} pageSize={8} total={tempData.total} onChange={onChange} current={tempData.current}/>
210 206
       </div>
211 207
     </>
212 208
   )
213 209
 }
214 210
 const WrappedHeader = Form.create({ name: 'header' })(header);
215 211
 
216
-export default WrappedHeader
212
+export default WrappedHeader

+ 1
- 3
src/pages/system/document/audit.jsx Прегледај датотеку

@@ -28,10 +28,8 @@ function body (props) {
28 28
   }
29 29
 
30 30
   function onVerify (params) {
31
-
32
-    // alert(params)
33 31
     // 网路请求
34
-    request({ ...apis.system.updateTaPolicy, urlData: { id: documentVerifyId }, data: { verifyStatus: params } }).then(data => {
32
+    request({ ...apis.system.updateVerify, urlData: { id: documentVerifyId }, data: { verifyStatus: params } }).then(data => {
35 33
 
36 34
     }).catch(err => {
37 35
       // eslint-disable-next-line no-unused-expressions

+ 1
- 1
src/services/apis.js Прегледај датотеку

@@ -622,7 +622,7 @@ export default {
622 622
       method: 'GET',
623 623
       action: 'admin.documentVerify.id.get',
624 624
     },
625
-    updateTaPolicy: {
625
+    updateVerify: {
626 626
       url: `${prefix}/documentVerify/:id`,
627 627
       method: 'PUT',
628 628
       action: 'admin.documentVerify.id.put',

+ 4
- 4
src/utils/request.js Прегледај датотеку

@@ -86,14 +86,14 @@ request.interceptors.response.use(async (response, options) => {
86 86
       if (code != 1000) {
87 87
         if (code === 1001) {
88 88
           notification.error({
89
-            message: `请求错误`,
90
-            description: '请登录系统',
89
+            message: `请登录系统`,
90
+            // description: '请登录系统',
91 91
           });
92 92
           throw new Error('请登录系统');
93 93
         } else {
94 94
           notification.error({
95
-            message: `请求错误`,
96
-            description: message,
95
+            message,
96
+            // description: message,
97 97
           });
98 98
           throw new Error(message);
99 99
         }