Merge branch 'final' of http://120.77.240.215:9701/Maple/tostumi.git into final

src/models/PropertyManagement.ts

@@ -19,7 +19,6 @@ export default {
   effects: {
     //获取物业费列表
     *get({ playload }: any, { call, put }: any) {
-      console.log(playload);
       const resp = yield call(service.get, playload);
       console.log(resp);
       let Data = resp.data;

src/pages/CommercialService/CardDetail.tsx

@@ -188,7 +188,7 @@ const CardDetail = (props: any) => {
                   <Col span={3}>Examine:</Col>
                   <Col span={4}>
                     <Radio.Group value={listData.apply_status === 2 ? '2' : '1'}>
-                      <Radio.Button value={'1'}>Agree</Radio.Button>
+                      <Radio.Button value={'1'}>Approve</Radio.Button>
                       <Radio.Button style={{ marginLeft: 10 }} value={'2'}>
                         Reject
                       </Radio.Button>

src/pages/PropertyManagement/ChargeDetail.css

+.base {
+  width: 100%;
+  background-color: #ffffff;
+  padding: 34px;
+  min-width: 1020px;
+  overflow-x: auto;
+}
+.box {
+  width: 100%;
+  height: 64px;
+  position: relative;
+}
+.item1 {
+  position: absolute;
+  width: 180px;
+  text-align: center;
+  border-left: 5px solid #1890ff;
+  font-family: 'Source Han Sans CN';
+  font-size: 18px;
+  font-weight: 600;
+  color: #000000;
+}
+.item2 {
+  width: 300px;
+  position: absolute;
+  left: 216px;
+  line-height: 30px;
+}
+.item3 {
+  width: 80px;
+  height: 32px;
+  position: absolute;
+  right: 0;
+  outline: none;
+  background: none;
+  cursor: pointer;
+  border: 1px solid #d9d9d9;
+  border-radius: 2px;
+}
+.box2 {
+  width: 100%;
+  height: 130px;
+  text-align: center;
+  position: relative;
+}
+.item21 {
+  line-height: 32px;
+  width: 200px;
+  position: absolute;
+}
+.item22 {
+  line-height: 32px;
+  position: absolute;
+  left: 200px;
+  width: 200px;
+  height: 32px;
+  border: 1px solid #d9d9d9;
+  border-radius: 2px;
+}
+.item23 {
+  line-height: 32px;
+  position: absolute;
+  left: 416px;
+  border: 1px solid #d9d9d9;
+  border-radius: 2px;
+  width: 200px;
+  height: 32px;
+}
+.item24 {
+  line-height: 32px;
+  border: 1px solid #d9d9d9;
+  border-radius: 2px;
+  position: absolute;
+  left: 640px;
+  width: 80px;
+  height: 32px;
+}
+.item234 {
+  line-height: 32px;
+  height: 32px;
+  position: absolute;
+  left: 720px;
+}
+.item25 {
+  line-height: 32px;
+  width: 80px;
+  height: 32px;
+  border: 1px solid #d9d9d9;
+  border-radius: 2px;
+  position: absolute;
+  left: 740px;
+}
+.item245 {
+  line-height: 32px;
+  position: absolute;
+  left: 830px;
+}
+.item26 {
+  width: 80px;
+  height: 32px;
+  line-height: 32px;
+  border: 1px solid #d9d9d9;
+  border-radius: 2px;
+  position: absolute;
+  left: 860px;
+}
+.item27 {
+  width: 200px;
+  height: 32px;
+  line-height: 32px;
+  border: 1px solid #d9d9d9;
+  border-radius: 2px;
+  position: absolute;
+  left: 200px;
+  top: 55px;
+}
+.box3out {
+  padding-left: 200px;
+}
+.box3 {
+  width: 780px;
+  border: 1px solid #d9d9d9;
+  background-color: #f4f4f4;
+  cursor: pointer;
+  overflow: auto;
+}
+.box3of {
+  cursor: pointer;
+}
+.box4 {
+  padding-left: 200px;
+}
+.time1 {
+  position: absolute;
+  top: -60px;
+  left: 270px;
+}
+.time2 {
+  position: absolute;
+  top: -60px;
+  left: 360px;
+}

src/pages/PropertyManagement/ChargeDetail.less

-@import '~antd/lib/style/themes/default.less';
-
 //基石
 .base {
   width: 100%;
@@ -71,28 +69,23 @@
   left: 416px;
   border: 1px solid rgba(217, 217, 217, 1);
   border-radius: 2px;
-  width: 140px;
-  height: 32px;
-}
-.item234 {
-  line-height: 32px;
+  width: 200px;
   height: 32px;
-  position: absolute;
-  left: 665px;
 }
 .item24 {
   line-height: 32px;
   border: 1px solid rgba(217, 217, 217, 1);
   border-radius: 2px;
   position: absolute;
-  left: 580px;
+  left: 640px;
   width: 80px;
   height: 32px;
 }
-.item245 {
+.item234 {
   line-height: 32px;
+  height: 32px;
   position: absolute;
-  left: 766px;
+  left: 720px;
 }
 .item25 {
   line-height: 32px;
@@ -101,7 +94,12 @@
   border: 1px solid rgba(217, 217, 217, 1);
   border-radius: 2px;
   position: absolute;
-  left: 680px;
+  left: 740px;
+}
+.item245 {
+  line-height: 32px;
+  position: absolute;
+  left: 830px;
 }
 .item26 {
   width: 80px;
@@ -110,7 +108,7 @@
   border: 1px solid rgba(217, 217, 217, 1);
   border-radius: 2px;
   position: absolute;
-  left: 800px;
+  left: 860px;
 }
 .item27 {
   width: 200px;

src/pages/PropertyManagement/ChargeDetail.tsx

 import React, { useState, useEffect } from 'react';
 import styles from './ChargeDetail.less';
-import { Pagination, Tooltip, Spin } from 'antd';
+import { Pagination, Tooltip } from 'antd';
 
 import { useIntl, connect } from 'umi';
 
@@ -31,7 +31,6 @@ const ChargeDetail = (props: any) => {
           },
         },
       });
-      console.log('发起请求');
     } else {
       history.back();
     }
@@ -73,7 +72,7 @@ const ChargeDetail = (props: any) => {
             <div className={styles.item24}>{CurData.buildingNumber}</div>
             <div className={styles.item234}>#</div>
             <div className={styles.item25}>{CurData.floorNumber}</div>
-            <div className={styles.item245}>——</div>
+            <div className={styles.item245}>—</div>
             <div className={styles.item26}>{CurData.roomNumber}</div>
             <div className={styles.item27}>{CurData.tosOwnerName}</div>
           </div>
@@ -88,7 +87,7 @@ const ChargeDetail = (props: any) => {
                     // key="pdfjs"
                     file={
                       // 'data:application/pdf;base64,' + stringSplit(CurData.billFileUrl, 'm/cash')
-                      stringSplit(CurData.billFileUrl || FileImg, 'm/cash')
+                      FileImg || stringSplit(CurData.billFileUrl, 'm/cash')
                     }
                     // workerSrc="//cdnjs.cloudflare.com/ajax/libs/pdf.js/2.2.228/pdf.worker.js"
                     scale={scale}

src/pages/UserManagement/LIFEUserManagement/ResultPageFailed.tsx

@@ -24,7 +24,7 @@ const ResultPageFailed = (props: any) => {
         subTitle={<p>server has been handled it ,please try again or back.</p>}
         extra={[
           <Button type="primary" key="ok">
-            {/* <a href={'http://47.74.233.180:8651/tos/excel/down?operator_id=' + getCookie('id')}>
+            {/* <a href={'http://47.74.233.180:8651/tos/excel/down?operator_id=' + resultId}>
               Download
             </a> */}
             <a href={'http://192.168.1.28:8651/tos/excel/down?operator_id=' + resultId}>Download</a>

src/pages/UserManagement/LIFEUserManagement/Users.tsx

@@ -47,7 +47,7 @@ const Users = (props: any) => {
 
   const [loading, setLoading] = useState(false);
   const [fileUploading, setFileUploading] = useState(false);
-  const [compent, setCompent] = useState({ loading: false, fileUploading: false });
+  // const [compent, setCompent] = useState({ loading: false, fileUploading: false });
 
   const userInfo = localStorage.getItem('userInfo') || '';
   const id = JSON.parse(userInfo).userModel.id;
@@ -108,9 +108,12 @@ const Users = (props: any) => {
       if (info.file.status == 'uploading') {
         setFileUploading(true);
       }
+      console.log(info);
       if (info.file.status === 'done') {
         if (info.file.response.error_code == '0000') {
           history.push(location.pathname + '/Result');
+        } else if (info.file.response.error_code == '0002') {
+          message.error(info.file.response.error_msg);
         } else {
           history.push(location.pathname + '/ResultFailed');
           message.error(
@@ -250,15 +253,17 @@ const Users = (props: any) => {
         </button>
         <div className={styles.buttonAdd}>
           <Upload {...propsUpload}>
-            <Button icon={compent.fileUploading ? null : <UploadOutlined />}>
-              {compent.fileUploading ? (
-                <>
-                  <Spin indicator={<LoadingOutlined style={{ fontSize: 16 }} spin />} />
-                  Uploading
-                </>
-              ) : (
-                'Batch Upload'
-              )}
+            <Button
+              disabled={fileUploading}
+              icon={
+                fileUploading ? (
+                  <LoadingOutlined style={{ fontSize: 16 }} spin />
+                ) : (
+                  <UploadOutlined />
+                )
+              }
+            >
+              {fileUploading ? 'Uploading' : 'Batch Upload'}
             </Button>
           </Upload>
         </div>

src/services/PropertyManagementServices.ts

@@ -2,5 +2,14 @@ import request from '@/utils/request';
 
 export function get(values: any) {
   console.log(values)
-  return request('/tos/tosPropertyFee/get',{method: 'POST',body: JSON.stringify(values),headers:{ 'Content-Type': 'application/json'}})
+  const userInfo = localStorage.getItem('userInfo') || '';
+  const id = JSON.parse(userInfo).userModel.id;
+  return request('/tos/tosPropertyFee/get', {
+    method: 'POST',
+    body: JSON.stringify({
+      ...values,
+      mangerId: id
+    }),
+    headers: { 'Content-Type': 'application/json' }
+  })
 }
\ No newline at end of file