Commit 06fcf5cb by zqm

update: 更新最新修改

parent 841b7d5d
Pipeline #24829 canceled with stage
in 0 seconds
// const testToken = 'T3353641990669312'
const basePreUrl = 'hr.hrself.'
const basePreUrl = 'hr.hrself.';
// export const SetToken = function (val) {
// let env = process.env.NODE_ENV;
......@@ -14,25 +14,24 @@ const basePreUrl = 'hr.hrself.'
// })
// }
// }
//我要请假小程序appid
export const LeaveAppId = process.env.PACK_VENV === 'vprod' ? '500000125' : '500000125'
export default {
LoginUrl: basePreUrl + 'loginSelf',
AnnRollUrl: basePreUrl + 'annRollListSelf',
PayRollUrl: basePreUrl + 'payRollListSelf',
PayRolDetailUrl: basePreUrl + 'payRollInfoSelf',
InsurelUrl: basePreUrl + 'insRecordInfoSelf',
FundUrl: basePreUrl + 'fundRecordInfoSelf',
AwardUrl: basePreUrl + 'awardListSelf',
RewUrl: basePreUrl + 'rewProvideListSelf',
UserInfoUrl: basePreUrl + 'userInfoSelf',
UserModifyUrl: basePreUrl + 'modifyUserInfoSelf',
AddCodeUrl: basePreUrl + 'getCodeSelf',
HomeListUrl: basePreUrl + 'homeListSelf',
HomeInfoUrl: basePreUrl + 'homeInfoSelf',
HomeModifyUrl: basePreUrl + 'modifyHomeInfoSelf',
DiamondUrl: basePreUrl + 'diamondLifeV',
UpdatePassword: basePreUrl + 'updatePassword',
SendCodeByUserName: basePreUrl + 'sendCodeByUserName',
UpdatePasswordByCode: basePreUrl + 'updatePasswordByCode'
LoginUrl: basePreUrl + "loginSelf",
AnnRollUrl: basePreUrl + "annRollListSelf",
PayRollUrl: basePreUrl + "payRollListSelf",
PayRolDetailUrl: basePreUrl + "payRollInfoSelf",
InsurelUrl: basePreUrl + "insRecordInfoSelf",
FundUrl: basePreUrl + "fundRecordInfoSelf",
AwardUrl: basePreUrl + "awardListSelf",
RewUrl: basePreUrl + "rewProvideListSelf",
UserInfoUrl: basePreUrl + "userInfoSelf",
UserModifyUrl: basePreUrl + "modifyUserInfoSelf",
AddCodeUrl: basePreUrl + "getCodeSelf",
HomeListUrl: basePreUrl + "homeListSelf",
HomeInfoUrl: basePreUrl + "homeInfoSelf",
HomeModifyUrl: basePreUrl + "modifyHomeInfoSelf",
DiamondUrl: basePreUrl + "diamondLifeV",
UpdatePassword: basePreUrl + "updatePassword",
SendCodeByUserName: basePreUrl + "sendCodeByUserName",
UpdatePasswordByCode: basePreUrl + "updatePasswordByCode"
}
......@@ -17,8 +17,13 @@ const masConfig = process.env.PACK_VENV === 'vprod'
const mas = MAS.getInstance().config(masConfig)
Vue.prototype.$mas = mas
const debugToken = 'yzj_68ab62e08529511f15d5797337c1298f'
const debugUsername = 'hqhuang@cndrealty.com'
// const debugToken = 'T5572008802649088'
// const debugUsername = 'hqhuang@cndrealty.com'
const debugToken = 'T6159949480150016'
// const debugUsername = 'wusm@cndrealty.com'
const debugUsername = 'panxq@cndrealty.com'
// const debugUsername = 'zhxlin@cndrealty.com'
// const debugUsername = 'zhout@cndrealty.com'
// 调试模式下,为非V+包环境
const debug = process.env.NODE_ENV === 'development'
......
......@@ -93,4 +93,8 @@ export const MAS_CODES = {
StartWorkFlow: 'h3.workflow.startworkflow', // h3发起流程
GetAuthToken: 'h3.workflow.getAuthToken', // 获取流程平台接口鉴权
GetYearBonusDetail: 'shr.tomcat.actionGetYearBonusDetail', // 获取员工年终奖明细接口
JudgeIsLeader: 'shr.tomcat.judgeIsLeader', // 根据员工编码判断是否干部
}
......@@ -103,3 +103,17 @@ export async function getSettleAccountsSpecial (params) {
export async function getSettleAccountsMonth (params) {
return mas.proxy(MAS_CODES.GetSettleAccountsMonth, params)
}
/**
* @description: 获取员工年终奖明细
*/
export async function getYearBonusDetail (params) {
return mas.proxy(MAS_CODES.GetYearBonusDetail, params)
}
/**
* 根据员工编码判断是否干部
*/
export async function judgeIsLeader (params) {
return mas.proxy(MAS_CODES.JudgeIsLeader, params)
}
......@@ -68,10 +68,10 @@ export default {
},
created() {
// 初始化 token
// await Api.setToken(this)
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) => {
......
......@@ -5,11 +5,13 @@
v-for="(item,index) in listData"
:key="index"
is-link
v-show="item.alias !== 'yearEndBonus' || (isLogined && !isLeader)"
:border-intent="false"
:class="['border-bottom', index === 0 ? 'border-top' : '']"
@click.native="handleItemClick(item.alias)">
<p class="cell-title" slot="title">{{item.title}}</p>
<font-icon slot="icon" class="margin-r-8" :type="item.icon" />
<font-icon v-show="item.alias !== 'yearEndBonus'" slot="icon" class="margin-r-8" :type="item.icon" />
<img v-show="item.alias === 'yearEndBonus'" slot="icon" :src="require('@/assets/images/year-end-bonus.png')" class="margin-r-8" width="14" height="16" />
</cell>
</group>
</div>
......@@ -39,7 +41,7 @@ export default {
items: [
{
alias: 'salary',
title: '资查询',
title: '资查询',
icon: 'ic_xinzi'
},
{
......@@ -63,6 +65,11 @@ export default {
icon: 'ic_jiangjin'
},
{
alias: 'yearEndBonus',
title: '全年收入查询',
icon: 'year-end-bonus',
},
{
alias: 'yearEnd',
title: '我的薪资福利',
icon: 'ic_nianzhon'
......@@ -77,6 +84,8 @@ export default {
},
computed: {
...mapState('user', [
'isLogined',
'isLeader',
'hasRew'
]),
listData () {
......
......@@ -305,8 +305,8 @@ export default {
})
params = {
finishStart: true, // 是否提交发起节点
// workflowCode: 'CT_HR_FLOW_ZZZM_001', // 流程模板编码
workflowCode: 'CT_HR_FLOW_CERTIFICATIONBILL', // 流程模板编码--旧
workflowCode: 'CT_HR_FLOW_ZZZM_001', // 流程模板编码
// workflowCode: 'CT_HR_FLOW_CERTIFICATIONBILL', // 流程模板编码--旧
userCode: this.proveUpdateList.hrUserAccount, // 用户账号
workflowInstanceId: null, // 流程实例ID
data: {
......@@ -346,8 +346,8 @@ export default {
})
params = {
finishStart: true, // 是否提交发起节点
// workflowCode: 'CT_HR_FLOW_SRZM_001', // 流程模板编码
workflowCode: 'CT_HR_FLOW_INCOMEVERIFICATIO', // 流程模板编码--旧
workflowCode: 'CT_HR_FLOW_SRZM_001', // 流程模板编码
// workflowCode: 'CT_HR_FLOW_INCOMEVERIFICATIO', // 流程模板编码--旧
userCode: this.proveUpdateIncomeList.hrUserAccount, // 用户账号
workflowInstanceId: null, // 流程实例ID
data: {
......
// The Vue build version to load with the `import` command
// (runtime-only or standalone) has been set in webpack.base.conf with an alias.
import './polyfill/index'
import Vue from 'vue'
import router from './router'
import App from './app.vue'
import store from './store'
import plugin from './plugin'
import routerStore from '../libraries/plugins/RouterStore'
import * as Api from '@/api/index'
// import VConsole from 'vconsole'
// let vconsole = new VConsole()
import VConsole from 'vconsole'
if(process.env.PACK_VENV==='vtest'){
new VConsole()
}
Vue.use(routerStore, store, router)
Vue.config.debug = process.env.NODE_ENV !== 'production'
Vue.config.productionTip = false
const vm = new Vue({
/* eslint-disable no-new */
new Vue({
el: '#app',
store,
router,
plugin,
template: '<App/>',
components: { App }
})
window.qing.ready(async () => {
// 初始化 token
await Api.setToken(vm)
vm.$mount('#app')
})
......@@ -35,6 +35,7 @@ import Submission from '~com/prove/Submission.vue'
import Printtemplate from '~com/prove/printtemplate.vue'
import SocialAppointments from '~com/socialAppointments/'
import workexPerience from '~com/workexperience/'
import yearEndBonus from '~com/yearEndBonus'
Vue.use(VueRouter)
......@@ -179,9 +180,7 @@ routes = routes.concat([{
{
path: '/input',
name: 'input',
component: function (resolve) {
return require(['@/components/commom/c-input'], resolve)
}
component: resolve => require(['@/components/commom/c-input'], resolve)
},
{
path: '/userFamily',
......@@ -223,9 +222,7 @@ routes = routes.concat([{
},{
path:'/addressChoose', // 籍贯、户口所在地、出生地、生源地--选择页
name:'addressChoose',
component: function (resolve) {
return require(['@/components/commom/addressChoose'], resolve)
}
component: resolve => require(['@/components/commom/addressChoose'], resolve)
},{
path:'/socialRelation', // 社会信息-添加/删除/编辑
name:'socialRelation',
......@@ -237,9 +234,11 @@ routes = routes.concat([{
},{ // 公司选择,支持搜索
path:'/companyChoose',
name:'companyChoose',
component: function (resolve) {
return require(['@/components/commom/companyChoose'], resolve)
}
component: resolve => require(['@/components/commom/companyChoose'], resolve)
},{ // 全年收入查询
path: '/yearEndBonus',
name: 'yearEndBonus',
component: yearEndBonus
}
])
......
......@@ -254,11 +254,9 @@ export default {
}
})
.catch(err => {
console.log('报错了1>>',err)
commit('networkError', err, { root: true })
})
} catch (error) {
console.log('报错了2>>',err)
commit('networkError', error, { root: true })
}
},
......
......@@ -6,6 +6,8 @@ import {
viewEmployeeRecord,
viewPerformanceInfo,
viewRewardAndPuni,
judgeIsLeader,
getYearBonusDetail,
getSettleAccountsYears,
getSettleAccountsTotal,
getSettleAccountsSpecial,
......@@ -28,6 +30,7 @@ export default {
isLogined: false,
username: '',
userInfo: {},
isLeader: false, // 是否干部领导
hasRew: false, // 是否有风险金
mySalaryToNow: {}, // 我的薪资福利
employeeRecord: [], // 任职记录
......@@ -52,6 +55,9 @@ export default {
updateUserInfo (state, payload) {
state.userInfo = payload || {}
},
isLeader (state, payload) {
state.isLeader = payload
},
updateRewState (state, payload) {
state.hasRew = payload
},
......@@ -111,7 +117,7 @@ export default {
commit('networkError', error, { root: true })
}
},
async getUserInfo ({ commit, state }, payload) {
async getUserInfo ({ commit, state, dispatch }, payload) {
try {
let param = { userEmail: state.username }
let arr = []
......@@ -121,6 +127,10 @@ export default {
.then(resultArr => {
if (resultArr[0].success) {
commit('updateUserInfo', {...resultArr[0].infoMap})
// 判断是否干部
if (resultArr[0].infoMap && resultArr[0].infoMap.number) {
dispatch('judgeIsLeader', { number: resultArr[0].infoMap.number })
}
}
if (resultArr[1].success) {
commit('updateUserInfo', {...state.userInfo, enterDay: resultArr[1].enterDay, infoPercent: resultArr[1].infoPercent})
......@@ -365,5 +375,24 @@ export default {
commit('networkError', error, { root: true })
}
},
// 根据员工编码判断是否干部
async judgeIsLeader ({ commit }, payload) {
try {
const response = await judgeIsLeader(payload)
commit('isLeader', !!response.data)
return response
} catch (error) {
commit('networkError', error, { root: true })
}
},
async getYearBonusDetail ({ commit }, payload) {
// 年终奖明细查询
try {
const response = await getYearBonusDetail(payload)
return response
} catch (error) {
commit('networkError', error, { root: true })
}
},
}
}
/** 水印添加方法 */
const setWatermarkFn = (str1, str2, show) => {
let winW = document.documentElement.clientWidth || document.body.clientWidth
let winH = document.documentElement.clientHeight || document.body.clientHeight
const id = 'waterMark'
if (document.getElementById(id) !== null) {
document.body.removeChild(document.getElementById(id))
}
const can = document.createElement('canvas')
// 设置canvas画布大小
console.log('winW>>', winW)
can.width = (winW-48)/2
// can.width = 190
can.height = 195
const cans = can.getContext('2d')
cans.rotate(-40 * Math.PI / 180) // 水印旋转角度
cans.font = '16px 微软雅黑'
cans.fillStyle = '#999'
cans.textAlign = 'center'
cans.textBaseline = 'middle'
// cans.fillText(str1, can.width / 2, can.height) // 水印在画布的位置x,y轴
cans.fillText(str1, 10, can.height-40) // 水印在画布的位置x,y轴
// cans.fillText(str2, can.width / 2, can.height + 25)
const div = document.createElement('div')
div.id = id
div.style.pointerEvents = 'none'
div.style.top = '-60px'
div.style.left = '-10px'
if (show) {
div.style.opacity = '0'
} else {
div.style.opacity = '0.3'
}
div.style.position = 'fixed'
div.style.zIndex = '1000'
div.style.width = winW + 'px'
div.style.height = winH + 'px'
div.style.background = 'url(' + can.toDataURL('image/png') + ') left top repeat'
document.body.appendChild(div)
return id
}
// 添加水印方法
export const setWaterMark = (str1, str2) => {
let id = setWatermarkFn(str1, str2)
if (document.getElementById(id) === null) {
id = setWatermarkFn(str1, str2)
}
}
// 移除水印方法
export const removeWatermark = () => {
const id = 'waterMark'
if (document.getElementById(id) !== null) {
document.body.removeChild(document.getElementById(id))
}
}
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