14:24

.idea/workspace.xml

@@ -3,15 +3,6 @@
   <component name="ChangeListManager">
     <list default="true" id="980ddd15-b0f5-453d-b57f-9e0d36b01ada" name="Default" comment="智慧校园APP网页前端代码上传">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/applications/wechat/wechat-api/wechat-api.iml" beforeDir="false" afterPath="$PROJECT_DIR$/applications/wechat/wechat-api/wechat-api.iml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/applications/wechat/wechat-server/wechat-server.iml" beforeDir="false" afterPath="$PROJECT_DIR$/applications/wechat/wechat-server/wechat-server.iml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/frontend/wechat-web/src/configs/api.config.js" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/wechat-web/src/configs/api.config.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/frontend/wechat-web/src/modules/hiPages/approvel-detail/ApprovelDetail.js" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/wechat-web/src/modules/hiPages/approvel-detail/ApprovelDetail.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/frontend/wechat-web/src/modules/hiPages/approvel/Approvel.js" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/wechat-web/src/modules/hiPages/approvel/Approvel.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/frontend/wechat-web/src/modules/hiPages/field-trip/FieldTrip.js" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/wechat-web/src/modules/hiPages/field-trip/FieldTrip.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/frontend/wechat-web/src/modules/hiPages/res_apply/ResApply.js" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/wechat-web/src/modules/hiPages/res_apply/ResApply.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/frontend/wechat-web/src/modules/hiPages/scorenotification/ScoreNotification.js" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/wechat-web/src/modules/hiPages/scorenotification/ScoreNotification.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/frontend/wechat-web/src/modules/leave/LeaveAddCPage.js" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/wechat-web/src/modules/leave/LeaveAddCPage.js" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/out/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -63,8 +54,9 @@
           <entry key="project.open.time.32" value="1" />
           <entry key="project.open.time.34" value="1" />
           <entry key="project.open.time.36" value="1" />
+          <entry key="project.open.time.46" value="1" />
           <entry key="project.open.time.47" value="1" />
-          <entry key="project.opened" value="4" />
+          <entry key="project.opened" value="5" />
         </counts>
       </usages-collector>
     </session>
@@ -86,8 +78,8 @@
       <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/frontend/wechat-web/src/modules/hiPages/scorenotification/ScoreNotification.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="507">
-              <caret line="117" column="78" selection-start-line="117" selection-start-column="78" selection-end-line="117" selection-end-column="78" />
+            <state relative-caret-position="255">
+              <caret line="103" column="16" selection-start-line="103" selection-start-column="16" selection-end-line="103" selection-end-column="16" />
             </state>
           </provider>
         </entry>
@@ -104,7 +96,7 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/frontend/wechat-web/src/modules/hiPages/approvel-detail/ApprovelDetail.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="507">
+            <state relative-caret-position="4662">
               <caret line="272" column="75" selection-start-line="272" selection-start-column="75" selection-end-line="272" selection-end-column="75" />
             </state>
           </provider>
@@ -113,7 +105,7 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/frontend/wechat-web/src/modules/hiPages/approvel/Approvel.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="4554">
+            <state relative-caret-position="4536">
               <caret line="267" selection-start-line="267" selection-end-line="267" />
             </state>
           </provider>
@@ -134,8 +126,8 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/frontend/wechat-web/src/modules/leave/LeaveAddCPage.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="237">
-              <caret line="350" column="16" lean-forward="true" selection-start-line="350" selection-start-column="16" selection-end-line="350" selection-end-column="16" />
+            <state relative-caret-position="6084">
+              <caret line="350" column="16" selection-start-line="350" selection-start-column="16" selection-end-line="350" selection-end-column="16" />
             </state>
           </provider>
         </entry>
@@ -276,9 +268,9 @@
       <select />
     </treeState>
   </component>
-  <component name="ProjectFrameBounds" extendedState="1">
-    <option name="x" value="67" />
-    <option name="y" value="11" />
+  <component name="ProjectFrameBounds" extendedState="7">
+    <option name="x" value="35" />
+    <option name="y" value="20" />
     <option name="width" value="1346" />
     <option name="height" value="728" />
   </component>
@@ -291,7 +283,7 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scope" />
+      <pane id="AndroidView" />
       <pane id="PackagesPane" />
       <pane id="ProjectPane">
         <subPane>
@@ -357,7 +349,7 @@
           <select />
         </subPane>
       </pane>
-      <pane id="AndroidView" />
+      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -378,7 +370,7 @@
     <property name="project.structure.last.edited" value="Modules" />
     <property name="project.structure.proportion" value="0.15" />
     <property name="project.structure.side.proportion" value="0.2" />
-    <property name="settings.editor.selected.configurable" value="editor.preferences.fonts.default" />
+    <property name="settings.editor.selected.configurable" value="configurable.group.language" />
   </component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
@@ -526,6 +518,7 @@
       <workItem from="1548076460566" duration="676000" />
       <workItem from="1548124343719" duration="993000" />
       <workItem from="1548130857837" duration="602000" />
+      <workItem from="1548134210359" duration="1768000" />
     </task>
     <task id="LOCAL-00001" summary="删除编译文件">
       <created>1547633261163</created>
@@ -622,11 +615,10 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="42564000" />
+    <option name="totallyTimeSpent" value="44332000" />
   </component>
   <component name="ToolWindowManager">
-    <frame x="67" y="11" width="1346" height="728" extended-state="1" />
-    <editor active="true" />
+    <frame x="-8" y="-8" width="1382" height="744" extended-state="7" />
     <layout>
       <window_info content_ui="combo" id="Project" order="0" weight="0.22083981" />
       <window_info id="Structure" order="1" weight="0.25340393" />
@@ -1012,9 +1004,16 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/frontend/wechat-web/src/modules/hiPages/approvel-detail/ApprovelDetail.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="4662">
+          <caret line="272" column="75" selection-start-line="272" selection-start-column="75" selection-end-line="272" selection-end-column="75" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/frontend/wechat-web/src/modules/hiPages/approvel/Approvel.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="4554">
+        <state relative-caret-position="4536">
           <caret line="267" selection-start-line="267" selection-end-line="267" />
         </state>
       </provider>
@@ -1031,22 +1030,15 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/frontend/wechat-web/src/modules/leave/LeaveAddCPage.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="237">
-          <caret line="350" column="16" lean-forward="true" selection-start-line="350" selection-start-column="16" selection-end-line="350" selection-end-column="16" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/frontend/wechat-web/src/modules/hiPages/approvel-detail/ApprovelDetail.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="507">
-          <caret line="272" column="75" selection-start-line="272" selection-start-column="75" selection-end-line="272" selection-end-column="75" />
+        <state relative-caret-position="6084">
+          <caret line="350" column="16" selection-start-line="350" selection-start-column="16" selection-end-line="350" selection-end-column="16" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/frontend/wechat-web/src/modules/hiPages/scorenotification/ScoreNotification.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="507">
-          <caret line="117" column="78" selection-start-line="117" selection-start-column="78" selection-end-line="117" selection-end-column="78" />
+        <state relative-caret-position="255">
+          <caret line="103" column="16" selection-start-line="103" selection-start-column="16" selection-end-line="103" selection-end-column="16" />
         </state>
       </provider>
     </entry>

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

@@ -168,12 +168,14 @@ class ApprovelDetail extends Component{
         if(order == 0){
             return
         }
-        fetchPost(API.doapprove,{
+        let params = {
             teacherId:this.props.userInfo.userId,
             approveId:this.state.approveId,
             status:this.state.handleStatus,
             approveOpinion:this.state.approveOpinion
-        },{}).then((response)=>{
+        }
+        console.log("params",params)
+        fetchPost(API.doapprove,params,{}).then((response)=>{
             if(response.success && response.data){
                 Toast.show(response.data,1)
                 this.setState({
@@ -200,15 +202,7 @@ class ApprovelDetail extends Component{
     componentWillMount() {
         document.title = '审批详情';
     }
-    componentWillReceiveProps(newProps) {
-    }
-    shouldComponentUpdate(newProps, newState) {
-        return true;
-    }
-    componentWillUpdate(nextProps, nextState) {
-    }
-    componentDidUpdate(prevProps, prevState) {
-    }
+
     componentWillUnmount() {
         Toast.hide()
         clearTimeout(this.backTask)
@@ -216,7 +210,6 @@ class ApprovelDetail extends Component{
     componentDidMount() {
         this.node.scrollIntoView();
         this.setState({
-            // pictureList: this.state.pictureList.concat(pictures, pictures),
             approveId:this.props.match.params.approveId,
             isMyApply:this.props.match.params.isMyApply
         },function () {

frontend/wechat-web/src/modules/hiPages/approvel/Approvel.js

@@ -63,7 +63,6 @@ class Approvel extends Component {
                 }
             }
         })
-
         this.getMyApplyData();
         this.getMyApproveData();
     }
@@ -79,7 +78,7 @@ class Approvel extends Component {
                     <List dataSource={this.state.applyList}
                           renderItem={applyListBean => (
                               <List.Item>
-                                  <ApprovelItem itemdata={applyListBean} type={1}/>
+                                  <ApprovelItem itemdata={applyListBean} isMyApply={true}/>
                               </List.Item>
                           )}/>
                 </Skeleton>
@@ -94,7 +93,7 @@ class Approvel extends Component {
                     <List dataSource={this.state.approvelList}
                           renderItem={approvelListBean => (
                               <List.Item>
-                                  <ApprovelItem itemdata={approvelListBean} type={2}/>
+                                  <ApprovelItem itemdata={approvelListBean}isMyApply={false}/>
                               </List.Item>
                           )}/>
                 </Skeleton>
@@ -118,20 +117,12 @@ class Approvel extends Component {
                          this.contain = el
                      }}>
                     <div className="swiper-wrapper">
-                        {
-                            !isObjEmpty(this.state.applyList) ?
-                                <div className="swiper-slide">
-                                    {/*{this.state.applyList.map((itemdata,index) => <ApprovelItem isMyApply={true} type={1} index={index} itemata = {itemdata} clickApplyItem ={this.clickApplyItem} ></ApprovelItem>)}*/}
-                                    {isMyapplyItems}
-                                </div> : ''
-                        }
-                        {
-                            !isObjEmpty(this.state.approvelList) ?
-                                <div className="swiper-slide">
-                                    {/*{this.state.approvelList.map((itemdata,index) => <ApprovelItem isMyApply={false}  type={2} index={index} itemata = {itemdata} clickApprovelItem ={this.clickApprovelItem} ></ApprovelItem>)}*/}
-                                    {isMyapproveItems}
-                                </div> : ''
-                        }
+                        <div className="swiper-slide">
+                            {isMyapplyItems}
+                        </div>
+                        <div className="swiper-slide">
+                            {isMyapproveItems}
+                        </div>
                     </div>
                 </div>
             </div>
@@ -147,8 +138,7 @@ class Approvel extends Component {
         } catch (e) {
 
         }
-        // Toast.loading("获取数据中...", 0)
-        // Toast.hide()
+
         fetchGet(API.oaApproveList, {
             teacherId: this.props.userInfo.userId,
             pageIndex: myApplypageIndex,

frontend/wechat-web/src/modules/hiPages/approvel/ApprovelItem.js

@@ -17,7 +17,9 @@ export default class ApprovelItem extends Component{
     constructor(props){
         super(props);
         this.state={
-
+            itemdata:this.props.itemdata,
+            isMyApply:this.props.isMyApply,
+            approveId:this.props.itemdata.approveId
         }
     }
     componentDidMount(){
@@ -34,25 +36,22 @@ export default class ApprovelItem extends Component{
 
         const {itemdata,isMyApply,approveId} = this.state
         return(
-            <div>
-
-                <Link to={"/approvel-detail/" + approveId +"/"+isMyApply}>
-                    <div className="item-Style" onClick={this.ItemClick.bind(this,isMyApply,itemdata)}>
-                        <div style={{width:76,height:'100%'}}>
-                            <img src={itemdata.approveType == 1 ? icon_trip : (itemdata.approveType == 2 ? icon_res : icon_leave)} className={isMyApply==true?'img_sty':"img_circle"}/>
-                        </div>
-                        <div style={{width:'65%'}}>
-                            <div style={{color:"#333333",fontSize:15,marginTop:10}}>
-                                {itemdata.approveType == 1 ? '出差申请' :  (itemdata.approveType == 2 ? '用品申请' : '请假申请' )}
-                            </div>
-                            <div style={{color:"#666666",fontSize:12,marginTop:15}}>{this.props.itemdata.creatDate}</div>
-                        </div>
-                        <div className={itemdata.approveStatus==1?'doing':'done'} style={{textAlign:'left',marginTop:10,fontSize:12}}>
-                            {itemdata.approveStatus == 1 ? "待审批" :"已审批"}
+            <Link to={"/approvel-detail/" + approveId +"/"+isMyApply}>
+                <div className="item-Style" onClick={this.ItemClick.bind(this,isMyApply,itemdata)}>
+                    <div style={{width:76,height:'100%'}}>
+                        <img src={itemdata.approveType == 1 ? icon_trip : (itemdata.approveType == 2 ? icon_res : icon_leave)} className={isMyApply==true?'img_sty':"img_circle"}/>
+                    </div>
+                    <div style={{width:'65%'}}>
+                        <div style={{color:"#333333",fontSize:15,marginTop:10}}>
+                            {itemdata.approveType == 1 ? '出差申请' :  (itemdata.approveType == 2 ? '用品申请' : '请假申请' )}
                         </div>
+                        <div style={{color:"#666666",fontSize:12,marginTop:15}}>{this.props.itemdata.creatDate}</div>
+                    </div>
+                    <div className={itemdata.approveStatus==1?'doing':'done'} style={{textAlign:'left',marginTop:10,fontSize:12}}>
+                        {itemdata.approveStatus == 1 ? "待审批" :"已审批"}
                     </div>
-                </Link>
-            </div>
+                </div>
+            </Link>
         )
     }
     ItemClick =(isMyApply,data)=>{