请假列表回复bug处理

frontend/wechat-web/src/configs/api.config.js

@@ -8,9 +8,9 @@ import store from './../redux/store/store'
  * Desc: 项目接口
  */
 // export const _host = 'https://school-api.ubtob.com'
-export const _host = 'http://10.1.80.47:9520' //顾群
+// export const _host = 'http://10.1.80.47:9520' //顾群
 // export const _host = 'http://10.1.80.180:9520' //赵耀
-// export const _host = 'http://10.1.80.36:9520'  //陈伟
+export const _host = 'http://10.1.80.36:9520'  //陈伟
 
 export const _baseURL = _host + '/api/school'
 // export const _baseURL = _host

frontend/wechat-web/src/configs/router.config.js

@@ -94,7 +94,7 @@ class RouteConfig extends Component {
                         <Route path='/phonesSearch/:type' component={PhonesSearch}/>{/*通讯录搜索页面*/}
 
                         <Route path='/principalMailbox' component={PrincipalMailbox}/>{/*校长信箱*/}
-                        <Route path='/meetingSignIn' component={MeetingSignIn}/>{/*会议列表*/}
+                         <Route path='/meetingSignIn' component={MeetingSignIn}/>{/*会议列表*/}
                         <Route path='/systemMessage' component={SystemMessage}/>{/*系统消息*/}
                         <Route path='/useHelp' component={UseHelp}/>{/*使用帮助*/}
                         <Route path='/wonderMoment/:type?' component={WonderMoment}/>{/*精彩瞬间*/}

frontend/wechat-web/src/modules/album/UploadImage.css

@@ -0,0 +1,2 @@
+.textarea_sty1{border:none; font-size:15px; color:#333333;color: #B2B2B2;}
+.left_title1{width:50px;font-size:15px;color:#333333;}

frontend/wechat-web/src/modules/album/UploadImage.jsx

@@ -12,6 +12,7 @@ import {_baseURL, API} from "../../configs/api.config";
 import {fetchGet, fetchPost} from "../../utils/fetchRequest";
 import PictureBean from "../../model/PictureBean";
 import {getStrValue} from "../../utils/common";
+import './UploadImage.css';
 
 export default class UploadImage extends Component {
 
@@ -21,7 +22,6 @@ export default class UploadImage extends Component {
 
     componentDidMount() {
         document.title = '编辑相册'
-
         Toast.loading('', 0)
         this.getPictureList(this.albumId)
     }
@@ -35,6 +35,8 @@ export default class UploadImage extends Component {
             previewVisible: false,
             previewImage: '',
             fileList: [],
+            albumTitle:'',
+            albumRemarks:""
         }
     }
 
@@ -42,7 +44,7 @@ export default class UploadImage extends Component {
         const {fileList} = this.state;
 
         return (
-            <div className='pageLayout'>
+            <div className='pageLayout' onChange={this.handelValueCom}>
                 <div className='gray-line'></div>
                 <div style={{flex: '1'}}>
                     <UploadEnclosure
@@ -56,7 +58,14 @@ export default class UploadImage extends Component {
                         handleRemove={this.handleRemove.bind(this)}
                     />
                 </div>
-
+                <div className="item_sty">
+                    <div className="left_title1">标题:</div>
+                    <input ref='albumTitle'  className="right_input" style={{marginLeft:10}} type="text" placeholder="请输入" maxLength={20} autoFocus="autoFocus" value={this.state.albumTitle}/>
+                </div>
+                <div className="item_sty">
+                    <div className="left_title1">描述:</div>
+                    <textarea ref='albumRemarks'  className="form-control textarea_sty" rows="3"  placeholder="请输入" maxLength={100} autoFocus="autoFocus" value={this.state.albumRemarks}/>
+                </div>
                 <div className='uploadLayout'>
                     <Button className='commonButton' type="primary" block style={{borderRadius:30}}
                             onClick={this.releaseEvent}>更新</Button>
@@ -72,12 +81,17 @@ export default class UploadImage extends Component {
             pageSize: 1000,
         }).then(response => {
             Toast.hide()
-
             const {fileList} = this.state
             fileList.length = 0
 
             if (response) {
                 const dataArray = response.data.clazzPictureDOS
+                if(response.data.albumTitle && response.data.albumRemarks){
+                    this.setState({
+                        albumTitle:response.data.albumTitle,
+                        albumRemarks:response.data.albumRemarks
+                    })
+                }
                 if (dataArray) {
                     dataArray.forEach((picture, index) => {
                         const pictureBean = new PictureBean()
@@ -120,7 +134,16 @@ export default class UploadImage extends Component {
     handleBefore = (file, fileList) => {
 
     }
-
+    handelValueCom = (event)=>{
+        //获取用户名的值
+        let albumTitle = this.refs.albumTitle.value;
+        let albumRemarks = this.refs.albumRemarks.value;
+        //获得内容的值
+        this.setState({
+            albumTitle:albumTitle,
+            albumRemarks:albumRemarks
+        })
+    }
     handleRemove = (file) => {
         console.log(file)
         /*fetchPost(API.DELETE_FILE, {
@@ -151,9 +174,22 @@ export default class UploadImage extends Component {
         }
         console.log(fileUrls)
 
+        let albumTitle = this.state.albumTitle
+        let albumRemarks = this.state.albumRemarks
+        if(albumTitle == '' || albumRemarks.length == 0){
+            Toast.fail('请输入相册标题')
+            return
+        }
+        if(albumRemarks == '' || albumRemarks.length == 0){
+            Toast.fail('请输入相册描述')
+            return
+        }
+
         fetchPost(API.UPDATE_ALBUM, {
             pictureUrls: JSON.stringify(fileUrls),
-            albumId: this.albumId
+            albumId: this.albumId,
+            albumTitle:albumTitle,
+            albumRemarks:albumRemarks
         }).then(response => {
             Toast.hide()
             Toast.success('更新成功')

frontend/wechat-web/src/modules/hiPages/LeaveDetail/LeaveDetail.js

@@ -182,10 +182,7 @@ class LeaveDetail extends Component {
             if (response.success) {
                 Toast.hide()
                 Toast.info("回复成功！");
-                this.setState({
-                    messageContent: ""
-                })
-                this.getleaveDetail(this.state.itemdetail.lvId)
+
                 // this.backTask = setTimeout(() => {
                 //     this.props.history.goBack();
                 // }, 2000)
@@ -196,6 +193,10 @@ class LeaveDetail extends Component {
                         listData: this.props.listState.listData,
                     })()
                 }
+                this.setState({
+                    messageContent: ""
+                })
+                this.getleaveDetail(this.state.itemdetail.lvId)
             }
         }).catch((error) => {
             Toast.fail(error)

frontend/wechat-web/src/modules/hiPages/approvel-detail/ItemApprovel.js

@@ -21,7 +21,11 @@ export default class ItemApprovel extends Component{
                     <div style={{width:10,height:10,background:'#BDBDBD',borderRadius:'30px'}}></div>
                     <div style={{marginLeft:10,width:"62%"}}>
                         <div ><span style={{color:'#000000',fontSize:15}}>{this.props.itemdata.value }</span><span style={{color:'#666666',fontSize:12,marginLeft:10}}>{this.props.approveDate}</span></div>
-                        <div style={{color:"#666666",fontSize:12,marginTop:5,wordWrap:'break-word'}}><span>{(this.props.suggest.value == null || this.props.suggest.value == undefined || this.props.suggest.value == '')?"(审批语:无)":"(审批语:"+this.props.suggest.value+")"}</span></div>
+                        {
+                            this.props.approveStatus == 2 ?
+                                <div style={{color:"#666666",fontSize:12,marginTop:5,wordWrap:'break-word'}}><span>{(this.props.suggest.value == null || this.props.suggest.value == undefined || this.props.suggest.value == '')?"(审批语:无)":"(审批语:"+this.props.suggest.value+")"}</span></div>
+                                : ''
+                        }
                     </div>
                     <div style={{fontSize:12,textAlign:'right'}} className={this.props.approveStatus == 1?'doing':'done'}>
                         {this.props.approveStatus == 1 ? '等待审批' : (this.props.approveStatus == 2 ? '已同意' : '已拒绝')}</div>

frontend/wechat-web/src/modules/homework/ReleaseAssignmentPage.js

@@ -9,7 +9,7 @@ import '../../style/css/app-gloal.css'
 import moment from 'moment'
 import {Input, Button, Icon, message} from 'antd';
 import TargetSelect from "../../components/TargetSelect";
-import {fetchPost, fetchGet} from '../../utils/fetchRequest';
+import {fetchPost, fetchGet,fetchPost2} from '../../utils/fetchRequest';
 import {_baseURL, API} from '../../configs/api.config';
 import {isObjEmpty, getIntValue, getStrValue} from '../../utils/common';
 import UploadEnclosure from 'components/UploadEnclosure'
@@ -172,9 +172,8 @@ class ReleaseAssignmentPage extends React.Component {
             subject_id:courseValue[0]
 
         }
-        fetchPost(API.homeWorkAdd, {
-            taskString: JSON.stringify(params)
-        }).then((response) => {
+        console.log(params)
+        fetchPost2(API.homeWorkAdd, JSON.stringify(params),{"Content-Type": 'application/json;charset=UTF-8'}).then((response) => {
             Toast.hide();
             if (response.success) {
                 Toast.success("发布成功！", 1)

frontend/wechat-web/src/modules/leave/LeaveListPage.js

@@ -60,7 +60,7 @@ class LeaveListPage extends React.Component{
         } else {
             // Toast.loading('数据加载中...', 0)
             mPageIndex = 0
-            this.getLeaveListData();
+            this.loadMoreAction();
         }
     }
 
@@ -74,7 +74,7 @@ class LeaveListPage extends React.Component{
                         ref={el => {
                             this.container = el
                         }}
-                        onRefresh={this.getListData}>
+                        onRefresh={this.loadMoreAction}>
                         {
                             this.state.data.length > 0 ?
                                 this.state.data.map((itemdata,index) =>  <LeaveItem itemdata={itemdata} role={this.state.role} index = {index} onItemClick={this.onItemClick.bind(this)}></LeaveItem>)
@@ -86,10 +86,10 @@ class LeaveListPage extends React.Component{
                                           </List.Item>
                                       )}/>
                         }
-                        <Skeleton loading={this.state.isLoading} active paragraph={{rows: 3}}>
-                            {this.state.data.map((itemdata,index) =>  <LeaveItem itemdata={itemdata} role={this.state.role} index = {index} onItemClick={this.onItemClick.bind(this)}></LeaveItem>
-                            )}
-                        </Skeleton>
+                        {/*<Skeleton loading={this.state.isLoading} active paragraph={{rows: 3}}>*/}
+                            {/*{this.state.data.map((itemdata,index) =>  <LeaveItem itemdata={itemdata} role={this.state.role} index = {index} onItemClick={this.onItemClick.bind(this)}></LeaveItem>*/}
+                            {/*)}*/}
+                        {/*</Skeleton>*/}
                     </RefreshLayout>
 
                     {
@@ -100,93 +100,6 @@ class LeaveListPage extends React.Component{
     }
 
 
-    getLeaveListData() {
-        try {
-            this.setState({
-                isRefreshing: true
-            })
-        } catch (e) {
-        }
-        mPageIndex = 1
-        if (this.state.role === "teacher") {
-            console.log("pageIndex",this.state.pageIndex);
-            fetchPost(API.leaveListTeacher, {
-                teacherId: this.props.userInfo.user.userFunId,
-                pageIndex: mPageIndex,
-                pageSize: this.state.pageSize
-            }).then((response) => {
-                Toast.hide()
-                this.state.data.length = 0;
-                for (let i = 0; i < response.data.length; i++) {
-                    let model = {
-                        lvId:response.data[i].lvId,
-                        title: response.data[i].lvTitle,
-                        endTime: response.data[i].endDate,
-                        startTime: response.data[i].startDate,
-                        content: response.data[i].lvDetails,
-                        enclosure:response.data[i].enclosure,
-                        leaveMessages:response.data[i].oaLeaveReplyDOS
-                    };
-                    this.state.data.push(model);
-                }
-                if(response.data.length<this.state.pageSize){
-
-                }
-                this.setState({
-                    data: this.state.data,
-                    isRefreshing: false,
-                    isLoading: false
-                },function () {
-                    if(this.state.data.length == 0){
-
-                    }
-                })
-
-            }).catch((error) => {
-                console.log("error:" + JSON.stringify(error));
-                this.setState({
-                    isRefreshing: false,
-                    isLoading: false
-                })
-            })
-        }
-        if (this.state.role === "parent") {
-            fetchPost(API.leaveListParent, {
-                stuId: this.props.userInfo.user.student.stuId,
-                pageIndex: mPageIndex,
-                pageSize: this.state.pageSize
-            }).then((response) => {
-                this.state.data.length = 0;
-                for (let i = 0; i < response.data.length; i++) {
-                    let model = {
-                        lvId:response.data[i].lvId,
-                        title: response.data[i].lvTitle,
-                        endTime: response.data[i].endDate,
-                        startTime: response.data[i].startDate,
-                        content: response.data[i].lvDetails,
-                        enclosure:response.data[i].enclosure,
-                        leaveMessages:response.data[i].oaLeaveReplyDOS
-                    };
-                    this.state.data.push(model);
-                }
-                if(response.data.length<this.state.pageSize){
-
-                }
-                this.setState({
-                    data: this.state.data,
-                    // data:[],
-                    isRefreshing: false,
-                    isLoading: false
-                })
-            }).catch((error) => {
-                console.log("error:" + JSON.stringify(error));
-                this.setState({
-                    isRefreshing: false,
-                    isLoading: false
-                })
-            })
-        }
-    }
     onItemClick = (index) => {
         console.log('onItemClick',index)
         console.log('listState', ReactDOM.findDOMNode(this.container).scrollTop)
@@ -198,6 +111,7 @@ class LeaveListPage extends React.Component{
         })()
     }
     loadMoreAction=()=> {
+        mPageIndex++;
         try {
             this.setState({
                 isRefreshing: true
@@ -205,14 +119,15 @@ class LeaveListPage extends React.Component{
         } catch (e) {
         }
         setTimeout(() => {
+            console.log("this.state.role",this.state.role)
             if (this.state.role === "teacher") {
                 fetchPost(API.leaveListTeacher, {
-                    userId: this.props.userInfo.user.userFunId,
+                    teacherId: this.props.userInfo.user.userFunId,
                     pageIndex:mPageIndex,
                     pageSize: this.state.pageSize
                 }).then((response) => {
-                    if(response.data.leaveNotify.length>0){
-                        for (let i = 0; i < response.data.leaveNotify.length; i++) {
+                    if(response.data.length>0){
+                        for (let i = 0; i < response.data.length; i++) {
                             let model = {
                                 lvId:response.data[i].lvId,
                                 title: response.data[i].lvTitle,
@@ -248,27 +163,24 @@ class LeaveListPage extends React.Component{
                     pageIndex: mPageIndex,
                     pageSize: this.state.pageSize
                 }).then((response) => {
-                    console.log("response:" + JSON.stringify(response));
                     if(response.data.length>0){
-                        for (let i = 0; i < response.data.length; i++) {
+                        response.data.forEach((itemdata,index)=>{
                             let model = {
-                                lvId:response.data[i].lvId,
-                                title: response.data[i].lvTitle,
-                                endTime: response.data[i].endDate,
-                                startTime: response.data[i].startDate,
-                                content: response.data[i].lvDetails,
-                                enclosure:response.data[i].enclosure,
-                                leaveMessages:response.data[i].oaLeaveReplyDOS
+                                lvId:itemdata.lvId,
+                                title: itemdata.lvTitle,
+                                endTime: itemdata.endDate,
+                                startTime: itemdata.startDate,
+                                content: itemdata.lvDetails,
+                                enclosure:itemdata.enclosure,
+                                leaveMessages:itemdata.oaLeaveReplyDOS
                             };
                             this.state.data.push(model);
-                        }
-                        this.setState({
-                            data: this.state.data
-                        },function () {
-                            if(this.state.data.length == 0){
-
-                            }
                         })
+                       this.setState({
+                           data:this.state.data
+                       },function () {
+                           console.log('data',this.state.data)
+                       })
                     }else{
 
                     }
@@ -284,10 +196,10 @@ class LeaveListPage extends React.Component{
                     })
                 })
             }
-        }, 1000)
+        }, 500)
 
     }
-    getListData= () =>{
+/*    getListData= () =>{
         if(mPageIndex == 0){
             mPageIndex = 1
             this.getLeaveListData()
@@ -295,7 +207,7 @@ class LeaveListPage extends React.Component{
             mPageIndex++;
             this.loadMoreAction()
         }
-    }
+    }*/
     onAddAction=()=>{
         this.props.history.push("/leaveAdd/");
     }

frontend/wechat-web/src/modules/notificationCenter/NotifyBoardDetail.jsx

@@ -34,7 +34,6 @@ class NotifyBoardDetail extends Component {
 
     componentDidMount() {
         document.title = '通知公告详情'
-
         this.obtainDetail()
     }
 
@@ -128,13 +127,19 @@ class NotifyBoardDetail extends Component {
         let url = '', params = {}
         url = API.NOTIFY_DETAIL_TEACHER
         let id = this.props.userInfo.user.userFunId
-        if (this.searchParams && this.searchParams.teacherId) {
-            id = this.searchParams.personId
+        let type = this.role=='parent' ? 0 :1
+        if (this.searchParams) {
+            if(this.searchParams.personId){
+                id = this.searchParams.personId
+            }
+            if(this.searchParams.type){
+                type = this.searchParams.type
+            }
         }
         params = {
             notifyId: this.notifyId,
             personId: id,
-            type:this.role=='parent' ? 0 :1
+            type:type
         }
 
         Toast.loading('', 0)