Skip to content

高东东-金蝶建发 / jf-yzj-employeeself-develop

Go to a project
Commit bcc905cb by zhongqm
Options

update：我要请假已经接入

parent 7ccd63cf
Pipeline #23922 failed with stage
in 0 seconds
Expand all
Inline Side-by-side
Showing with 125 additions and 82 deletions
index.html
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
<meta name="format-detection" content="telephone=no"/> <meta name="format-detection" content="telephone=no"/>
<meta name="viewport" content="initial-scale=1.0, maximum-scale=1.0, user-scalable=0"> <meta name="viewport" content="initial-scale=1.0, maximum-scale=1.0, user-scalable=0">
<script src="miniapp://common/js/qing/qing.js"></script> <script src="miniapp://common/js/qing/qing.js"></script>
<!-- <script src="https://staging.jffctest.com/public/js/qing/latest/qing.js"></script>-->
</head> </head>
<body> <body>
<div id="app"></div> <div id="app"></div>
......
jsconfig.json 0 → 100644
{
"compilerOptions": {
"baseUrl": "./",
"paths": {
"@/*": [
"./src/shared/*"
],
"~com/*": [
"./src/shared/components/*"
],
"~lib/*": [
"./src/libraries/*"
],
"~config/*": [
"./src/shared/config/*"
] ,"~proj/*": [
"./src/projectDynamic/*"
]
}
}
}
package.json
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
"scripts": { "scripts": {
"dev": "node build/dev-server.js", "dev": "node build/dev-server.js",
"start": "npm run dev", "start": "npm run dev",
"build": "npm run build:vtest", "build": "npm run build:test",
"build:test": "cross-env PACK_ENV=prod PACK_VENV=vtest node build/build.js", "build:test": "cross-env PACK_ENV=prod PACK_VENV=vtest node build/build.js",
"build:prod": "cross-env PACK_ENV=prod PACK_VENV=vprod node build/build.js" "build:prod": "cross-env PACK_ENV=prod PACK_VENV=vprod node build/build.js"
}, },
......
src/shared/api.js
// const testToken = 'T3353641990669312' // const testToken = 'T3353641990669312'
const basePreUrl = 'hr.hrself.'; const basePreUrl = 'hr.hrself.'
// export const SetToken = function (val) { // export const SetToken = function (val) {
// let env = process.env.NODE_ENV; // let env = process.env.NODE_ENV;
...@@ -14,24 +14,25 @@ const basePreUrl = 'hr.hrself.'; ...@@ -14,24 +14,25 @@ const basePreUrl = 'hr.hrself.';
// }) // })
// } // }
// } // }
//我要请假小程序appid
export const LeaveAppId = process.env.PACK_VENV === 'vprod' ? '500000125' : '500000125'
export default { export default {
LoginUrl: basePreUrl + "loginSelf", LoginUrl: basePreUrl + 'loginSelf',
AnnRollUrl: basePreUrl + "annRollListSelf", AnnRollUrl: basePreUrl + 'annRollListSelf',
PayRollUrl: basePreUrl + "payRollListSelf", PayRollUrl: basePreUrl + 'payRollListSelf',
PayRolDetailUrl: basePreUrl + "payRollInfoSelf", PayRolDetailUrl: basePreUrl + 'payRollInfoSelf',
InsurelUrl: basePreUrl + "insRecordInfoSelf", InsurelUrl: basePreUrl + 'insRecordInfoSelf',
FundUrl: basePreUrl + "fundRecordInfoSelf", FundUrl: basePreUrl + 'fundRecordInfoSelf',
AwardUrl: basePreUrl + "awardListSelf", AwardUrl: basePreUrl + 'awardListSelf',
RewUrl: basePreUrl + "rewProvideListSelf", RewUrl: basePreUrl + 'rewProvideListSelf',
UserInfoUrl: basePreUrl + "userInfoSelf", UserInfoUrl: basePreUrl + 'userInfoSelf',
UserModifyUrl: basePreUrl + "modifyUserInfoSelf", UserModifyUrl: basePreUrl + 'modifyUserInfoSelf',
AddCodeUrl: basePreUrl + "getCodeSelf", AddCodeUrl: basePreUrl + 'getCodeSelf',
HomeListUrl: basePreUrl + "homeListSelf", HomeListUrl: basePreUrl + 'homeListSelf',
HomeInfoUrl: basePreUrl + "homeInfoSelf", HomeInfoUrl: basePreUrl + 'homeInfoSelf',
HomeModifyUrl: basePreUrl + "modifyHomeInfoSelf", HomeModifyUrl: basePreUrl + 'modifyHomeInfoSelf',
DiamondUrl: basePreUrl + "diamondLifeV", DiamondUrl: basePreUrl + 'diamondLifeV',
UpdatePassword: basePreUrl + "updatePassword", UpdatePassword: basePreUrl + 'updatePassword',
SendCodeByUserName: basePreUrl + "sendCodeByUserName", SendCodeByUserName: basePreUrl + 'sendCodeByUserName',
UpdatePasswordByCode: basePreUrl + "updatePasswordByCode" UpdatePasswordByCode: basePreUrl + 'updatePasswordByCode'
} }
src/shared/api/index.js
...@@ -17,7 +17,7 @@ const masConfig = process.env.PACK_VENV === 'vprod' ...@@ -17,7 +17,7 @@ const masConfig = process.env.PACK_VENV === 'vprod'
const mas = MAS.getInstance().config(masConfig) const mas = MAS.getInstance().config(masConfig)
Vue.prototype.$mas = mas Vue.prototype.$mas = mas
const debugToken = 'T5005556394836992' const debugToken = 'yzj_68ab62e08529511f15d5797337c1298f'
const debugUsername = 'hqhuang@cndrealty.com' const debugUsername = 'hqhuang@cndrealty.com'
// 调试模式下，为非V+包环境 // 调试模式下，为非V+包环境
const debug = process.env.NODE_ENV === 'development' const debug = process.env.NODE_ENV === 'development'
......
src/shared/app.vue
...@@ -71,7 +71,7 @@ export default { ...@@ -71,7 +71,7 @@ export default {
// await Api.setToken(this) // await Api.setToken(this)
// 修改导航条颜色 // 修改导航条颜色
this.$nativeApi.system.statusBarColor([255, 255, 255, 1]) // this.$nativeApi.system.statusBarColor([255, 255, 255, 1])
// 监听路由变化 // 监听路由变化
this.$router.beforeEach((to, from, next) => { this.$router.beforeEach((to, from, next) => {
......
src/shared/components/homepage/home.vue
<template> <template>
<div class="view-content has-header bg"> <div class='view-content has-header bg'>
<div class="user_info"> <div class='user_info'>
<div> <div>
<h2>{{userName}}</h2> <h2>{{ userName }}</h2>
<p>您已入职{{dayCount}}天</p> <p>您已入职{{ dayCount }}天</p>
<!-- <p>新的一天，新开始的开始！</p> --> <!-- <p>新的一天，新开始的开始！</p> -->
</div> </div>
<div class="photoWrapper"> <div class='photoWrapper'>
<img :src="photoUrl" class="round_icon" /> <img :src='photoUrl' class='round_icon' />
</div> </div>
</div> </div>
<!-- 钻石人生-入口 （暂时隐藏）--> <!-- 钻石人生-入口 （暂时隐藏）-->
<div class="banner" @click="onBannerClick"> <div class='banner' @click='onBannerClick'>
<img class="bannerImg" src="../../assets/images/life_banner@2x.png" alt="life"> <img class='bannerImg' src='../../assets/images/life_banner@2x.png' alt='life'>
</div> </div>
<group gutter="0"> <group gutter='0'>
<cell :is-link="true" @click.native="clickMyInfo" class="border-top"> <cell :is-link='true' @click.native='clickMyInfo' class='border-top'>
<p class="cell-title" slot="title">个人信息修改</p> <p class='cell-title' slot='title'>个人信息修改</p>
<font-icon slot="icon" class="margin-r-8" type="ic_me" /> <font-icon slot='icon' class='margin-r-8' type='ic_me' />
<!-- <span slot="value" style="color:#D23930">完整度 {{percent}}</span> --> <!-- <span slot="value" style="color:#D23930">完整度 {{percent}}</span> -->
</cell> </cell>
<cell :is-link="true" @click.native="clickLeave" class="border-top"> <cell :is-link='true' @click.native='clickLeave' class='border-top'>
<p class="cell-title" slot="title">请假</p> <p class='cell-title' slot='title'>请假</p>
<font-icon slot="icon" class="margin-r-8" type="ic_qingjia" /> <font-icon slot='icon' class='margin-r-8' type='ic_qingjia' />
</cell> </cell>
<cell :is-link="true" @click.native="clickSalary" class="border-top"> <cell :is-link='true' @click.native='clickSalary' class='border-top'>
<p class="cell-title" slot="title">薪资查询</p> <p class='cell-title' slot='title'>薪资查询</p>
<font-icon slot="icon" class="margin-r-8" type="ic_xinzi" /> <font-icon slot='icon' class='margin-r-8' type='ic_xinzi' />
</cell> </cell>
<cell :is-link="true" @click.native="clickProve" class="border-top border-bottom"> <cell :is-link='true' @click.native='clickProve' class='border-top border-bottom'>
<p class="cell-title" slot="title">开具证明</p> <p class='cell-title' slot='title'>开具证明</p>
<font-icon slot="icon" class="margin-r-8" type="ic_zhengming" /> <font-icon slot='icon' class='margin-r-8' type='ic_zhengming' />
</cell> </cell>
</group> </group>
<img :src="require('../../assets/images/bg_bottom@2x.png')" class="bottom-img"/> <img :src="require('../../assets/images/bg_bottom@2x.png')" class='bottom-img' />
<login-dialog ref="dialogOA" v-on:loginSuccess="doLogin" /> <login-dialog ref='dialogOA' v-on:loginSuccess='doLogin' />
<half-year-dialog ref="halfYearDialog" @onButtonClick="gotoChange" /> <half-year-dialog ref='halfYearDialog' @onButtonClick='gotoChange' />
</div> </div>
</template> </template>
...@@ -45,6 +45,7 @@ import FontIcon from '@/components/commom/FontIcon' ...@@ -45,6 +45,7 @@ import FontIcon from '@/components/commom/FontIcon'
import { mapState, mapActions, mapMutations } from 'vuex' import { mapState, mapActions, mapMutations } from 'vuex'
import LoginDialog from './login' import LoginDialog from './login'
import HalfYearDialog from '@/components/commom/halfYearDialog' import HalfYearDialog from '@/components/commom/halfYearDialog'
import { LeaveAppId } from '@/api'
export default { export default {
components: { components: {
...@@ -55,7 +56,7 @@ export default { ...@@ -55,7 +56,7 @@ export default {
LoginDialog, LoginDialog,
HalfYearDialog HalfYearDialog
}, },
activated () { activated() {
this.init() this.init()
/* 用自定义事件重新document事件 /* 用自定义事件重新document事件
document.addEventListener('backbutton', this.onBackKeyDown) document.addEventListener('backbutton', this.onBackKeyDown)
...@@ -65,7 +66,7 @@ export default { ...@@ -65,7 +66,7 @@ export default {
} }
customEvt.addEventListener('backbutton', this._onBackKeyDown) customEvt.addEventListener('backbutton', this._onBackKeyDown)
}, },
deactivated () { deactivated() {
/* 用自定义事件重新document事件 /* 用自定义事件重新document事件
document.removeEventListener('backbutton', this.onBackKeyDown) document.removeEventListener('backbutton', this.onBackKeyDown)
*/ */
...@@ -79,7 +80,7 @@ export default { ...@@ -79,7 +80,7 @@ export default {
} }
}, },
watch: { watch: {
username () { username() {
// V+延时触发 // V+延时触发
if (this.username) { if (this.username) {
this.init() this.init()
...@@ -93,16 +94,16 @@ export default { ...@@ -93,16 +94,16 @@ export default {
'username', 'username',
'userid' 'userid'
]), ]),
userName () { userName() {
return this.userInfo.name return this.userInfo.name
}, },
dayCount () { dayCount() {
return this.userInfo.enterDay return this.userInfo.enterDay
}, },
percent () { percent() {
return this.userInfo.infoPercent return this.userInfo.infoPercent
}, },
photoUrl () { photoUrl() {
return this.userInfo.personPhoto ? (`data:image/jpeg;base64,${this.userInfo.personPhoto}`) : require('../../assets/images/avatar.png') return this.userInfo.personPhoto ? (`data:image/jpeg;base64,${this.userInfo.personPhoto}`) : require('../../assets/images/avatar.png')
} }
}, },
...@@ -118,7 +119,7 @@ export default { ...@@ -118,7 +119,7 @@ export default {
'updateIncumbencyProveInfo', 'updateIncumbencyProveInfo',
'updateIncomeProveInfo' 'updateIncomeProveInfo'
]), ]),
init () { init() {
// 移动端触发 // 移动端触发
if (this.username) { if (this.username) {
// 未登录，弹出登录对话框 // 未登录，弹出登录对话框
...@@ -129,22 +130,26 @@ export default { ...@@ -129,22 +130,26 @@ export default {
this.$mas.userName = this.username this.$mas.userName = this.username
} }
}, },
clickMyInfo () { clickMyInfo() {
this.$router.push({ name: 'myInfo' }) this.$router.push({ name: 'myInfo' })
}, },
clickSalary () { clickSalary() {
this.$router.push({ name: 'salaryList' }) this.$router.push({ name: 'salaryList' })
}, },
clickLeave () { clickLeave() {
this.$nativeApi.navigator.showWidget(['com.cnd.hr.leave']) // this.$nativeApi.navigator.showWidget(['com.cnd.hr.leave'])
qing.call('gotoLightApp', {
urlParam: 'cloudhub://miniapp?appid=' + LeaveAppId + '&path=index.html'
})
}, },
clickProve () { clickProve() {
// 清空缓存的证明数据 // 清空缓存的证明数据
this.updateIncumbencyProveInfo({}) this.updateIncumbencyProveInfo({})
this.updateIncomeProveInfo({}) this.updateIncomeProveInfo({})
this.$router.push({ name: 'prove' }) this.$router.push({ name: 'prove' })
}, },
onBackKeyDown (e) { onBackKeyDown(e) {
// 安卓点击返回键退出 // 安卓点击返回键退出
if (this.$router.currentRoute.name === 'homepage') { if (this.$router.currentRoute.name === 'homepage') {
this.$nativeApi.navigator.exit() this.$nativeApi.navigator.exit()
...@@ -167,7 +172,7 @@ export default { ...@@ -167,7 +172,7 @@ export default {
this.showHalfYearDialog() this.showHalfYearDialog()
} }
}, },
isNeedShowHalfYearDialog () { isNeedShowHalfYearDialog() {
let show = false let show = false
let isNeedCleanDate = false let isNeedCleanDate = false
// 上次确认状态 // 上次确认状态
...@@ -184,8 +189,8 @@ export default { ...@@ -184,8 +189,8 @@ export default {
let lastMonth = last.getMonth() + 1 let lastMonth = last.getMonth() + 1
let lastDay = last.getDate() let lastDay = last.getDate()
// 如果时间到了指定的日期，则需要再次弹出确认弹窗 // 如果时间到了指定的日期，则需要再次弹出确认弹窗
if (month === this.alertMonth &&　day === this.alertDay) { if (month === this.alertMonth && day === this.alertDay) {
if ( lastYear === year && lastMonth === month ) { if (lastYear === year && lastMonth === month) {
isNeedCleanDate = false isNeedCleanDate = false
// console.log('同年同月，不清除') // console.log('同年同月，不清除')
} else { } else {
...@@ -210,15 +215,15 @@ export default { ...@@ -210,15 +215,15 @@ export default {
} }
return show return show
}, },
showHalfYearDialog () { showHalfYearDialog() {
// 显示半年提示框(显示员工信息确认提示框) // 显示半年提示框(显示员工信息确认提示框)
// window.localStorage.setItem('lastShowDate_' + this.$store.state.shareStore.userid, new Date().getTime()) // window.localStorage.setItem('lastShowDate_' + this.$store.state.shareStore.userid, new Date().getTime())
this.$refs.halfYearDialog.showDialog() this.$refs.halfYearDialog.showDialog()
}, },
gotoChange () { gotoChange() {
this.clickMyInfo() this.clickMyInfo()
}, },
isNeedShowDiamondLife () { isNeedShowDiamondLife() {
// 新的一年里，第一次登录，自动打开钻石人生页面 // 新的一年里，第一次登录，自动打开钻石人生页面
let show = false let show = false
let lastDate = window.localStorage.getItem('newYear_' + this.$store.state.shareStore.userid) let lastDate = window.localStorage.getItem('newYear_' + this.$store.state.shareStore.userid)
...@@ -235,63 +240,69 @@ export default { ...@@ -235,63 +240,69 @@ export default {
} }
return show return show
}, },
showDiamondLife () { showDiamondLife() {
// 显示钻石人生 // 显示钻石人生
window.localStorage.setItem('newYear_' + this.$store.state.shareStore.userid, new Date().getTime()) window.localStorage.setItem('newYear_' + this.$store.state.shareStore.userid, new Date().getTime())
this.onBannerClick() this.onBannerClick()
}, },
onBannerClick () { onBannerClick() {
return return
// 钻石人生 // 钻石人生
this.$router.push({ name: 'diamondLife' }) this.$router.push({ name: 'diamondLife' })
} }
}, },
beforeRouteEnter (to, from, next) { beforeRouteEnter(to, from, next) {
next(vm => { next(vm => {
if (from.name === 'forgotPsw' || from.name === 'resetPsw') { if (from.name === 'forgotPsw' || from.name === 'resetPsw') {
// 再次显示登录对话框 // 再次显示登录对话框
vm.showLogin() vm.showLogin()
} }
}); })
} }
} }
</script> </script>
<!-- 全局样式 --> <!-- 全局样式 -->
<style lang="less"> <style lang='less'>
.vux-header { .vux-header {
background-color: #fff!important; background-color: #fff !important;
.vux-header-left { .vux-header-left {
color: #333333!important; color: #333333 !important;
.left-arrow:before { .left-arrow:before {
border-color: #333333!important; border-color: #333333 !important;
} }
} }
} }
.bg { .bg {
background-color: #ffffff!important; background-color: #ffffff !important;
} }
.weui-cells:before, .weui-cells:before,
.weui-cell:before { .weui-cell:before {
border-top: none!important; border-top: none !important;
} }
.weui-cells:after { .weui-cells:after {
border-bottom: none!important; border-bottom: none !important;
} }
.margin-r-8 { .margin-r-8 {
margin-right: 8px; margin-right: 8px;
} }
.border-top { .border-top {
border-top: 1px solid #D9D9D9; border-top: 1px solid #D9D9D9;
} }
.border-bottom { .border-bottom {
border-bottom: 1px solid #D9D9D9; border-bottom: 1px solid #D9D9D9;
} }
</style> </style>
<style lang="less" scoped> <style lang='less' scoped>
.user_info { .user_info {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
...@@ -302,11 +313,13 @@ export default { ...@@ -302,11 +313,13 @@ export default {
font-size: 24px; font-size: 24px;
font-weight: bold; font-weight: bold;
} }
p { p {
color: #666666; color: #666666;
font-size: 14px; font-size: 14px;
font-weight: 400; font-weight: 400;
} }
.photoWrapper { .photoWrapper {
display: flex; display: flex;
align-items: center; align-items: center;
...@@ -316,21 +329,25 @@ export default { ...@@ -316,21 +329,25 @@ export default {
height: 72px; height: 72px;
border-radius: 50%; border-radius: 50%;
overflow: hidden; overflow: hidden;
.round_icon { .round_icon {
width: 100%; width: 100%;
position: absolute; position: absolute;
left:50%; left: 50%;
top:50%; top: 50%;
transform:translate(-50%,-50%); transform: translate(-50%, -50%);
} }
} }
} }
.cell-title { .cell-title {
font-size: 20px; font-size: 20px;
} }
.weui-cell { .weui-cell {
padding: 15px; padding: 15px;
} }
.banner { .banner {
position: relative; position: relative;
width: 100%; width: 100%;
...@@ -344,6 +361,7 @@ export default { ...@@ -344,6 +361,7 @@ export default {
padding: 12px 15px; padding: 12px 15px;
} }
} }
.bottom-img { .bottom-img {
position: absolute; position: absolute;
width: 100%; width: 100%;
......
src/shared/store/modules/prove.js
...@@ -254,9 +254,11 @@ export default { ...@@ -254,9 +254,11 @@ export default {
} }
}) })
.catch(err => { .catch(err => {
console.log('报错了1>>',err)
commit('networkError', err, { root: true }) commit('networkError', err, { root: true })
}) })
} catch (error) { } catch (error) {
console.log('报错了2>>',err)
commit('networkError', error, { root: true }) commit('networkError', error, { root: true })
} }
}, },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment