vpn拉取历史文件初始化

pc4backstage/hrmAttendance/apis/groupSetting.js

@@ -67,3 +67,5 @@ export const saveAddMember = (params = {}) => WeaTools.callApi('/api/hrm/kq/grou
 export const getGroupLocationList = (params = {}) => WeaTools.callApi('/api/hrm/kq/grouplocation/getGroupLocationList', 'GET', params);
 
 export const getGroupWifiList = (params = {}) => WeaTools.callApi('/api/hrm/kq/groupwifi/getGroupWifiList', 'GET', params);
+
+export const saveValidateDate = (params = {}) => WeaTools.callApi('/api/hrm/kq/groupmember/saveValidateDate', 'POST', params);

pc4backstage/hrmAttendance/apis/overtimeRule.js

@@ -41,3 +41,7 @@ export const getOvertimeUnitForm = (params) => {
 export const saveOvertimeUnit = (params) => {
 	return WeaTools.callApi('/api/kq/overtimerules/saveOvertimeUnit', 'POST', params);
 }
+
+export const getOvertimeSearchCondition = (params) => {
+	return WeaTools.callApi('/api/kq/overtimerules/getOvertimeSearchCondition', 'GET', params);
+}

pc4backstage/hrmAttendance/apis/vacationRule.js

@@ -41,3 +41,7 @@ export const getUnitName = (params) => {
 export const isNameRepeat = (params) => {
 	return WeaTools.callApi('/api/kq/leaverules/isNameRepeat', 'GET', params);
 }
+
+export const getParentalForm = (params) => {
+	return WeaTools.callApi('/api/kq/leaveparental/getParentalForm', 'GET', params);
+}

pc4backstage/hrmAttendance/components/groupSetting/GroupInfo4Coms.js

@@ -42,8 +42,8 @@ export default class GroupInfo4Coms extends Component{
 
         let children = [
             (
-                <div>
+                <div style={{height: '100%'}}>
-                    <div style={{height: 680, position: 'relative'}}>
+                    <div style={{height: 'calc(100% - 64px)', position: 'relative'}}>
                         <Info ecId={`${this && this.props && this.props.ecId || ''}_Info@p8cxnm`} store={store} />
                     </div>
                     <WeaDialogFooter ecId={`${this && this.props && this.props.ecId || ''}_WeaDialogFooter@eacpnh`} buttons={buttons} moreBtn={{datas: menus}}/>

pc4backstage/hrmAttendance/components/groupSetting/Map.js

@@ -6,7 +6,7 @@ import has from 'lodash/has';
 const getLabel = WeaLocaleProvider.getLabel;
 import {i18n} from '../../public/i18n';
 
-let map, geolocation, geocoder;
+let map, geolocation, geocoder,MapAddress;
 
 @observer
 export default class Map extends Component {
@@ -32,13 +32,16 @@ export default class Map extends Component {
   }
 
   onSelectHandle = params => {
+    const{cityname,adname,business_area}=params
+    MapAddress=cityname+adname+business_area+params.address
     const {store: {onPositionSelected}} = this.props;
     let locationname = '', address = '', longitude = '', latitude = '';
     locationname = params.name;
-    address = params.address;
+    address = MapAddress
     const latlng = params.location.split(',');
     longitude = latlng[0];
     latitude = latlng[1];
+
     const data = {locationname,address,longitude,latitude}
     onPositionSelected && onPositionSelected(data);
     // this.setState({selectedPosition: data});
@@ -72,6 +75,7 @@ export default class Map extends Component {
     const {store} = this.props;
     const {rangeParams} = store;
     const mapProps = {showGeolocation: true}
+    const {locationname:name} = rangeParams;
 
     const {longitude, latitude} = rangeParams;
     if(/^(\-)?\d+(\.\d+)?$/.test(longitude) && /^(\-)?\d+(\.\d+)?$/.test(latitude)){
@@ -94,6 +98,7 @@ export default class Map extends Component {
             gaodeRegeoCallback={this.gaodeRegeoCallback}
             googleRegeoCallback={this.googleRegeoCallback}
             {...mapProps}
+            info={{name, address:MapAddress}}
           />
         </div>
         <div style={{height: 90, padding: 10}}>

pc4backstage/hrmAttendance/components/groupSetting/info/Member.js

@@ -1,10 +1,12 @@
 import React, {Component} from 'react';
 import {observer} from 'mobx-react';
-import {WeaAuth} from 'ecCom';
+import {WeaAuth,WeaDialog,WeaFormItem,WeaDatePicker,WeaHelpfulTip} from 'ecCom';
 import classnames from 'classnames';
+import { Button } from "antd";
 import {
 	WeaTableNew
 } from 'comsMobx';
+import { i18n } from '../../../public/i18n';
 const {
 	WeaTable
 } = WeaTableNew;
@@ -13,19 +15,65 @@ const {
 export default class Member extends Component{
     doDel = id => this.props.store.deleteMember({ids: id});
 
+    doEdit = (id) => {
+        const {store} = this.props;
+        store.isNewMemberToAttendanceGroup = false;
+        store.getMemberForm({groupmemberId: id});
+    }
+
     onOperatesClick = (record, index, operate) => {
         const func = operate.href ? operate.href.split(':')[1].split('(')[0] : '';
         const id = record.id ? record.id : '';
         this[func] && this[func](id);
     }
 
+    saveMember = () => {
+        const { store: { isDateInValidRange, doSaveMember, opId, memberForm, groupmemberId } } = this.props;
+        if (!isDateInValidRange(memberForm.getFormParams())) return;
+        doSaveMember({
+            ...memberForm.getFormParams(),
+            groupId: opId,
+            groupmemberId,
+        });
+    }
+
+    cancel = () => {
+        const { store: { memberAuthParams } } = this.props;
+        memberAuthParams.visible = false;
+    }
+
+    renderCol = (cols) => {
+        cols.map(c => {
+            if (['validatefrom', 'validateto'].includes(c.dataIndex)) {
+                c.render = (t, r) => {
+                    return <span>{r[c.dataIndex]==r[c.dataIndex+'span'] ? r[c.dataIndex] : i18n.label[546200]()}</span>
+                }
+            }
+        });
+    }
+
+    onDatePickerChange = (value) => {
+        const { store } = this.props;
+        store.validateDate = value;
+    }
+
+    onValidityDialogCancel = () => {
+        const { validityDialogParams } = this.props.store;
+        validityDialogParams.onCancel();
+    }
+
     render(){
         const {
             store
         } = this.props;
         const {
             refreshTab,
-            memberAuthParams
+            memberAuthParams,
+            isNewMemberToAttendanceGroup,
+            memberForm,
+            validityDialogParams,
+            batchSetDateType,
+            saveValidateDate,
         } = store;
         const className = classnames({
 			['tabPane']: true,
@@ -44,11 +92,55 @@ export default class Member extends Component{
                     hasOrder={true}
                     needScroll={true}
                     {...tableProps}
+                    getColumns={cols => this.renderCol(cols)}
                     onOperatesClick={(record, index, operate) => this.onOperatesClick(record, index, operate)}
                 />
                 {
-	        		memberAuthParams.visible && <WeaAuth ecId={`${this && this.props && this.props.ecId || ''}_WeaAuth@1elfx3`} {...memberAuthParams} />
+	        		memberAuthParams.visible && (
+                        isNewMemberToAttendanceGroup ? 
+                        <WeaAuth ecId={`${this && this.props && this.props.ecId || ''}_WeaAuth@1elfx3`} {...memberAuthParams} /> :
+                        <WeaDialog
+                            {...memberAuthParams}
+                            title={i18n.label[546175]()}
+                            style={{height: 200}}
+                            buttons={
+                                [
+                                    <Button type="primary" onClick={this.saveMember} >{i18n.label.ok()}</Button>,
+                                    <Button type="ghost" onClick={this.cancel}>{i18n.label.cancel()}</Button>
+                                ]
+                            }
+                        >
+                                {memberForm.isFormInit && memberForm.render({ col: 1 } )}
+                        </WeaDialog>
+                    )
                 }
+                 {
+	        		validityDialogParams.visible && (
+                        <WeaDialog
+                            {...validityDialogParams}
+                            title={(batchSetDateType == 'effective') ? i18n.label[546729](): i18n.label[546730]()}
+                            style={{height: 100}}
+                            buttons={
+                                [
+                                    <Button type="primary" onClick={saveValidateDate} >{i18n.label.ok()}</Button>,
+                                    <Button type="ghost" onClick={this.onValidityDialogCancel}>{i18n.label.cancel()}</Button>
+                                ]
+                            }
+                        >
+                            <div className='effectiveWrap'>
+                                <WeaFormItem label={(batchSetDateType == 'effective') ? i18n.label[546731]() : i18n.label[546732]()} labelCol={{ span: 8 }} wrapperCol={{ span: 16 }}>
+                                    <WeaDatePicker
+                                        onChange={this.onDatePickerChange}
+                                    />
+                                    <span className='tips'><WeaHelpfulTip  title={
+                                        (batchSetDateType == 'effective') ? i18n.label[546733]() : i18n.label[546734]()
+                                    } /></span>
+                                </WeaFormItem>
+                            </div>
+                        </WeaDialog>
+                    )
+                }
+                
             </div>
         )
     }