打卡日历优化,工资优化
parent
a27b093d7d
commit
16b6a7779d
|
@ -107,7 +107,7 @@
|
||||||
}
|
}
|
||||||
this.days = this.days.concat(curDaysArr);
|
this.days = this.days.concat(curDaysArr);
|
||||||
// 获取状态列表
|
// 获取状态列表
|
||||||
this.getStatusObj();
|
this.getStatusObj(uni.getStorageSync('casual_worksite_id'));
|
||||||
},
|
},
|
||||||
|
|
||||||
// 绘制下月天数占的格子
|
// 绘制下月天数占的格子
|
||||||
|
@ -125,11 +125,16 @@
|
||||||
},
|
},
|
||||||
|
|
||||||
// 获取状态列表
|
// 获取状态列表
|
||||||
getStatusObj(){
|
getStatusObj(id){
|
||||||
|
if(id&&id!==''&&id!==undefined){
|
||||||
|
uni.setStorageSync('casual_worksite_id',uni.getStorageSync('worker_role')!==0?id:0)
|
||||||
|
}else{
|
||||||
|
uni.setStorageSync('casual_worksite_id',uni.getStorageSync('worker_role')!==0?uni.getStorageSync('worksite_id'):0)
|
||||||
|
}
|
||||||
let params = {
|
let params = {
|
||||||
date:`${this.curYear}-${this.curMonth<10?'0'+this.curMonth:this.curMonth}`,
|
date:`${this.curYear}-${this.curMonth<10?'0'+this.curMonth:this.curMonth}`,
|
||||||
worksite_id:uni.getStorageSync('worker_role')!==0?uni.getStorageSync('worksite_id'):0
|
worksite_id:uni.getStorageSync('casual_worksite_id')
|
||||||
}
|
};
|
||||||
this.$requst.get('/api/v1/user/month-sign-log',params).then(res=>{
|
this.$requst.get('/api/v1/user/month-sign-log',params).then(res=>{
|
||||||
if(res.code==0){
|
if(res.code==0){
|
||||||
console.log(res,'月度打卡信息');
|
console.log(res,'月度打卡信息');
|
||||||
|
|
|
@ -50,7 +50,8 @@
|
||||||
<view class="item font26" v-for="(item,index) in payList" :key="index">
|
<view class="item font26" v-for="(item,index) in payList" :key="index">
|
||||||
<view class="info info-other">
|
<view class="info info-other">
|
||||||
<text>{{item.name}}</text>
|
<text>{{item.name}}</text>
|
||||||
<text :class="item.status==0?'color-blue':'color-66'">{{item.status_text}}</text>
|
<text class="color-66" v-if="item.status==2">部分发放:{{item.paid_amount}}元</text>
|
||||||
|
<text :class="item.status==0?'color-blue':'color-66'" v-else>{{item.status==0?'待发放':'已发放'}}</text>
|
||||||
</view>
|
</view>
|
||||||
<view class="wages-info">
|
<view class="wages-info">
|
||||||
<view class="text">基本工资:{{item.base_amount}}元</view>
|
<view class="text">基本工资:{{item.base_amount}}元</view>
|
||||||
|
|
|
@ -20,6 +20,7 @@
|
||||||
this.$requst.post('/api/v1/user/info').then(res=>{
|
this.$requst.post('/api/v1/user/info').then(res=>{
|
||||||
if(res.code==0){
|
if(res.code==0){
|
||||||
console.log(res,'用户信息');
|
console.log(res,'用户信息');
|
||||||
|
uni.setStorageSync('worker_role',res.data.role);
|
||||||
if(res.data.role==2){
|
if(res.data.role==2){
|
||||||
uni.reLaunch({
|
uni.reLaunch({
|
||||||
url:'/pages/worker/sign/sign?userType=director'
|
url:'/pages/worker/sign/sign?userType=director'
|
||||||
|
|
|
@ -696,7 +696,7 @@
|
||||||
|
|
||||||
// 获取打卡记录
|
// 获取打卡记录
|
||||||
getSignList(){
|
getSignList(){
|
||||||
this.$requst.get('/api/v1/user/sign-today').then(res=>{
|
this.$requst.get('/api/v1/user/sign-today',{worksite_id:uni.getStorageSync('worksite_id')?uni.getStorageSync('worksite_id'):''}).then(res=>{
|
||||||
if(res.code == 0){
|
if(res.code == 0){
|
||||||
console.log(res,'打卡记录');
|
console.log(res,'打卡记录');
|
||||||
// 获取打卡状态
|
// 获取打卡状态
|
||||||
|
|
|
@ -105,8 +105,10 @@
|
||||||
this.getWorksiteList();
|
this.getWorksiteList();
|
||||||
},
|
},
|
||||||
onShow() {
|
onShow() {
|
||||||
// 获取打卡列表
|
setTimeout(()=>{
|
||||||
this.getSignList();
|
// 获取打卡列表
|
||||||
|
this.getSignList();
|
||||||
|
},200)
|
||||||
},
|
},
|
||||||
onReachBottom() {
|
onReachBottom() {
|
||||||
if(this.signList.length<this.total){
|
if(this.signList.length<this.total){
|
||||||
|
@ -168,7 +170,7 @@
|
||||||
this.$toolAll.tools.showToast('补卡成功');
|
this.$toolAll.tools.showToast('补卡成功');
|
||||||
this.showCard = false;
|
this.showCard = false;
|
||||||
// 获取状态列表
|
// 获取状态列表
|
||||||
this.$refs.signCalendar.getStatusObj();
|
this.$refs.signCalendar.getStatusObj(this.worksiteList[this.worksiteIndex].id);
|
||||||
}else{
|
}else{
|
||||||
this.$toolAll.tools.showToast(res.msg);
|
this.$toolAll.tools.showToast(res.msg);
|
||||||
}
|
}
|
||||||
|
@ -177,7 +179,11 @@
|
||||||
|
|
||||||
// 获取打卡列表
|
// 获取打卡列表
|
||||||
getSignList(){
|
getSignList(){
|
||||||
this.$requst.get('/api/v1/user/sign-today',{day:this.curDate}).then(res=>{
|
let params = {
|
||||||
|
day:this.curDate,
|
||||||
|
worksite_id:this.worksiteIndex!==-1?this.worksiteList[this.worksiteIndex].id:0
|
||||||
|
}
|
||||||
|
this.$requst.get('/api/v1/user/sign-today',params).then(res=>{
|
||||||
if(res.code == 0){
|
if(res.code == 0){
|
||||||
console.log(res,'打卡记录');
|
console.log(res,'打卡记录');
|
||||||
// 获取打卡状态
|
// 获取打卡状态
|
||||||
|
@ -194,6 +200,8 @@
|
||||||
this.page = 1;
|
this.page = 1;
|
||||||
// 获取打卡列表
|
// 获取打卡列表
|
||||||
this.getSignList();
|
this.getSignList();
|
||||||
|
// 获取状态列表
|
||||||
|
this.$refs.signCalendar.getStatusObj(this.worksiteList[this.worksiteIndex].id);
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -8,7 +8,8 @@
|
||||||
<view class="item font26" v-for="(item,index) in wagesList" :key="index">
|
<view class="item font26" v-for="(item,index) in wagesList" :key="index">
|
||||||
<view class="info info-other">
|
<view class="info info-other">
|
||||||
<text>{{item.date}}</text>
|
<text>{{item.date}}</text>
|
||||||
<text :class="item.status==0?'color-blue':'color-66'">{{item.status_text}}</text>
|
<text class="color-66" v-if="item.status==2">部分发放:{{item.paid_amount}}元</text>
|
||||||
|
<text :class="item.status==0?'color-blue':'color-66'" v-else>{{item.status==0?'待发放':'已发放'}}</text>
|
||||||
</view>
|
</view>
|
||||||
<view class="wages-info">
|
<view class="wages-info">
|
||||||
<view class="text">基本工资:{{item.base_amount}}元</view>
|
<view class="text">基本工资:{{item.base_amount}}元</view>
|
||||||
|
|
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
@ -262,7 +262,7 @@ var _default = {
|
||||||
}
|
}
|
||||||
this.days = this.days.concat(curDaysArr);
|
this.days = this.days.concat(curDaysArr);
|
||||||
// 获取状态列表
|
// 获取状态列表
|
||||||
this.getStatusObj();
|
this.getStatusObj(uni.getStorageSync('casual_worksite_id'));
|
||||||
},
|
},
|
||||||
// 绘制下月天数占的格子
|
// 绘制下月天数占的格子
|
||||||
nextMonthDays: function nextMonthDays(lastWeek) {
|
nextMonthDays: function nextMonthDays(lastWeek) {
|
||||||
|
@ -278,11 +278,16 @@ var _default = {
|
||||||
this.days = this.days.concat(nextDaysArr);
|
this.days = this.days.concat(nextDaysArr);
|
||||||
},
|
},
|
||||||
// 获取状态列表
|
// 获取状态列表
|
||||||
getStatusObj: function getStatusObj() {
|
getStatusObj: function getStatusObj(id) {
|
||||||
var _this = this;
|
var _this = this;
|
||||||
|
if (id && id !== '' && id !== undefined) {
|
||||||
|
uni.setStorageSync('casual_worksite_id', uni.getStorageSync('worker_role') !== 0 ? id : 0);
|
||||||
|
} else {
|
||||||
|
uni.setStorageSync('casual_worksite_id', uni.getStorageSync('worker_role') !== 0 ? uni.getStorageSync('worksite_id') : 0);
|
||||||
|
}
|
||||||
var params = {
|
var params = {
|
||||||
date: "".concat(this.curYear, "-").concat(this.curMonth < 10 ? '0' + this.curMonth : this.curMonth),
|
date: "".concat(this.curYear, "-").concat(this.curMonth < 10 ? '0' + this.curMonth : this.curMonth),
|
||||||
worksite_id: uni.getStorageSync('worker_role') !== 0 ? uni.getStorageSync('worksite_id') : 0
|
worksite_id: uni.getStorageSync('casual_worksite_id')
|
||||||
};
|
};
|
||||||
this.$requst.get('/api/v1/user/month-sign-log', params).then(function (res) {
|
this.$requst.get('/api/v1/user/month-sign-log', params).then(function (res) {
|
||||||
if (res.code == 0) {
|
if (res.code == 0) {
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
<view class="pad-x120 data-v-578c57e5"><status-nav vue-id="cc01b47e-1" ifReturn="{{false}}" ifHome="{{true}}" navBarTitle="工地支出" class="data-v-578c57e5" bind:__l="__l"></status-nav><view class="content data-v-578c57e5" style="{{'padding-top:'+(statusHeight+50+'px')+';'}}"><view class="screen-box pay-screen-box data-v-578c57e5"><view class="item data-v-578c57e5"><picker class="font24 data-v-578c57e5" mode="date" range="{{date}}" fields="month" start="{{startDate}}" end="{{endDate}}" data-event-opts="{{[['change',[['bindDateChange',['$event']]]]]}}" bindchange="__e"><view class="name data-v-578c57e5"><text class="{{['data-v-578c57e5',showDate==''?'color-99':'']}}">{{showDate!==''?$root.g0[0]+'年'+$root.g1[1]+'月':'请选择时间'}}</text><image src="/static/icon/icon-arrow-02.png" mode="aspectFit" class="data-v-578c57e5"></image></view></picker></view><view class="item data-v-578c57e5"><picker class="font24 data-v-578c57e5" mode="selector" range="{{cateList}}" value="{{cateIndex}}" data-event-opts="{{[['change',[['bindCateChange',['$event']]]]]}}" bindchange="__e"><view class="name data-v-578c57e5"><text class="{{['clips1','data-v-578c57e5',cateIndex==0?'color-99':'']}}">{{cateList[cateIndex]}}</text><image src="/static/icon/icon-arrow-02.png" mode="aspectFit" class="data-v-578c57e5"></image></view></picker></view></view><view class="pay-info font26 data-v-578c57e5"><view class="item font30 data-v-578c57e5"><text class="data-v-578c57e5">工资总金额</text><text class="data-v-578c57e5">{{"合计:"+(payInfo.amount?payInfo.amount:0)+"元"}}</text></view><view class="item data-v-578c57e5"><text class="data-v-578c57e5">基本工资</text><text class="data-v-578c57e5">{{(payInfo.base_amount?payInfo.base_amount:0)+"元"}}</text></view><view class="item data-v-578c57e5"><text class="data-v-578c57e5">加班工资</text><text class="data-v-578c57e5">{{(payInfo.overtime_amount?payInfo.overtime_amount:0)+"元"}}</text></view><view class="item data-v-578c57e5"><text class="data-v-578c57e5">待发工资</text><text class="data-v-578c57e5">{{(payInfo.not_amount?payInfo.not_amount:0)+"元"}}</text></view><view class="item data-v-578c57e5"><text class="data-v-578c57e5">已发工资</text><text class="data-v-578c57e5">{{(payInfo.done_amount?payInfo.done_amount:0)+"元"}}</text></view></view><view class="sign-record sign-record-other bg-white data-v-578c57e5"><block wx:for="{{payList}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view class="item font26 data-v-578c57e5"><view class="info info-other data-v-578c57e5"><text class="data-v-578c57e5">{{item.name}}</text><text class="{{['data-v-578c57e5',item.status==0?'color-blue':'color-66']}}">{{item.status_text}}</text></view><view class="wages-info data-v-578c57e5"><view class="text data-v-578c57e5">{{"基本工资:"+item.base_amount+"元"}}</view><view class="text data-v-578c57e5">{{"加班工资:"+item.overtime_amount+"元"}}</view><view class="text data-v-578c57e5">合计:<text class="font32 data-v-578c57e5">{{item.amount}}</text>元</view></view></view></block></view><view class="more-tips font24 data-v-578c57e5">{{$root.g2==total?'没有更多数据了':'下滑获取更多'}}</view></view><tabbar vue-id="cc01b47e-2" userType="{{userType}}" current="1" class="data-v-578c57e5" bind:__l="__l"></tabbar></view>
|
<view class="pad-x120 data-v-578c57e5"><status-nav vue-id="cc01b47e-1" ifReturn="{{false}}" ifHome="{{true}}" navBarTitle="工地支出" class="data-v-578c57e5" bind:__l="__l"></status-nav><view class="content data-v-578c57e5" style="{{'padding-top:'+(statusHeight+50+'px')+';'}}"><view class="screen-box pay-screen-box data-v-578c57e5"><view class="item data-v-578c57e5"><picker class="font24 data-v-578c57e5" mode="date" range="{{date}}" fields="month" start="{{startDate}}" end="{{endDate}}" data-event-opts="{{[['change',[['bindDateChange',['$event']]]]]}}" bindchange="__e"><view class="name data-v-578c57e5"><text class="{{['data-v-578c57e5',showDate==''?'color-99':'']}}">{{showDate!==''?$root.g0[0]+'年'+$root.g1[1]+'月':'请选择时间'}}</text><image src="/static/icon/icon-arrow-02.png" mode="aspectFit" class="data-v-578c57e5"></image></view></picker></view><view class="item data-v-578c57e5"><picker class="font24 data-v-578c57e5" mode="selector" range="{{cateList}}" value="{{cateIndex}}" data-event-opts="{{[['change',[['bindCateChange',['$event']]]]]}}" bindchange="__e"><view class="name data-v-578c57e5"><text class="{{['clips1','data-v-578c57e5',cateIndex==0?'color-99':'']}}">{{cateList[cateIndex]}}</text><image src="/static/icon/icon-arrow-02.png" mode="aspectFit" class="data-v-578c57e5"></image></view></picker></view></view><view class="pay-info font26 data-v-578c57e5"><view class="item font30 data-v-578c57e5"><text class="data-v-578c57e5">工资总金额</text><text class="data-v-578c57e5">{{"合计:"+(payInfo.amount?payInfo.amount:0)+"元"}}</text></view><view class="item data-v-578c57e5"><text class="data-v-578c57e5">基本工资</text><text class="data-v-578c57e5">{{(payInfo.base_amount?payInfo.base_amount:0)+"元"}}</text></view><view class="item data-v-578c57e5"><text class="data-v-578c57e5">加班工资</text><text class="data-v-578c57e5">{{(payInfo.overtime_amount?payInfo.overtime_amount:0)+"元"}}</text></view><view class="item data-v-578c57e5"><text class="data-v-578c57e5">待发工资</text><text class="data-v-578c57e5">{{(payInfo.not_amount?payInfo.not_amount:0)+"元"}}</text></view><view class="item data-v-578c57e5"><text class="data-v-578c57e5">已发工资</text><text class="data-v-578c57e5">{{(payInfo.done_amount?payInfo.done_amount:0)+"元"}}</text></view></view><view class="sign-record sign-record-other bg-white data-v-578c57e5"><block wx:for="{{payList}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view class="item font26 data-v-578c57e5"><view class="info info-other data-v-578c57e5"><text class="data-v-578c57e5">{{item.name}}</text><block wx:if="{{item.status==2}}"><text class="color-66 data-v-578c57e5">{{"部分发放:"+item.paid_amount+"元"}}</text></block><block wx:else><text class="{{['data-v-578c57e5',item.status==0?'color-blue':'color-66']}}">{{item.status==0?'待发放':'已发放'}}</text></block></view><view class="wages-info data-v-578c57e5"><view class="text data-v-578c57e5">{{"基本工资:"+item.base_amount+"元"}}</view><view class="text data-v-578c57e5">{{"加班工资:"+item.overtime_amount+"元"}}</view><view class="text data-v-578c57e5">合计:<text class="font32 data-v-578c57e5">{{item.amount}}</text>元</view></view></view></block></view><view class="more-tips font24 data-v-578c57e5">{{$root.g2==total?'没有更多数据了':'下滑获取更多'}}</view></view><tabbar vue-id="cc01b47e-2" userType="{{userType}}" current="1" class="data-v-578c57e5" bind:__l="__l"></tabbar></view>
|
|
@ -158,6 +158,7 @@ var _default = {
|
||||||
this.$requst.post('/api/v1/user/info').then(function (res) {
|
this.$requst.post('/api/v1/user/info').then(function (res) {
|
||||||
if (res.code == 0) {
|
if (res.code == 0) {
|
||||||
console.log(res, '用户信息');
|
console.log(res, '用户信息');
|
||||||
|
uni.setStorageSync('worker_role', res.data.role);
|
||||||
if (res.data.role == 2) {
|
if (res.data.role == 2) {
|
||||||
uni.reLaunch({
|
uni.reLaunch({
|
||||||
url: '/pages/worker/sign/sign?userType=director'
|
url: '/pages/worker/sign/sign?userType=director'
|
||||||
|
|
|
@ -681,7 +681,9 @@ var _default = {
|
||||||
// 获取打卡记录
|
// 获取打卡记录
|
||||||
getSignList: function getSignList() {
|
getSignList: function getSignList() {
|
||||||
var _this13 = this;
|
var _this13 = this;
|
||||||
this.$requst.get('/api/v1/user/sign-today').then(function (res) {
|
this.$requst.get('/api/v1/user/sign-today', {
|
||||||
|
worksite_id: uni.getStorageSync('worksite_id') ? uni.getStorageSync('worksite_id') : ''
|
||||||
|
}).then(function (res) {
|
||||||
if (res.code == 0) {
|
if (res.code == 0) {
|
||||||
console.log(res, '打卡记录');
|
console.log(res, '打卡记录');
|
||||||
// 获取打卡状态
|
// 获取打卡状态
|
||||||
|
|
|
@ -249,8 +249,11 @@ var _default = {
|
||||||
this.getWorksiteList();
|
this.getWorksiteList();
|
||||||
},
|
},
|
||||||
onShow: function onShow() {
|
onShow: function onShow() {
|
||||||
// 获取打卡列表
|
var _this = this;
|
||||||
this.getSignList();
|
setTimeout(function () {
|
||||||
|
// 获取打卡列表
|
||||||
|
_this.getSignList();
|
||||||
|
}, 200);
|
||||||
},
|
},
|
||||||
onReachBottom: function onReachBottom() {
|
onReachBottom: function onReachBottom() {
|
||||||
if (this.signList.length < this.total) {
|
if (this.signList.length < this.total) {
|
||||||
|
@ -269,22 +272,22 @@ var _default = {
|
||||||
methods: {
|
methods: {
|
||||||
// 获取工地列表
|
// 获取工地列表
|
||||||
getWorksiteList: function getWorksiteList() {
|
getWorksiteList: function getWorksiteList() {
|
||||||
var _this = this;
|
var _this2 = this;
|
||||||
this.$requst.get('/api/v1/common/worksite-list').then(function (res) {
|
this.$requst.get('/api/v1/common/worksite-list').then(function (res) {
|
||||||
if (res.code == 0) {
|
if (res.code == 0) {
|
||||||
_this.worksiteList = res.data.list;
|
_this2.worksiteList = res.data.list;
|
||||||
if (uni.getStorageSync('worksite_id')) {
|
if (uni.getStorageSync('worksite_id')) {
|
||||||
_this.worksiteIndex = _this.worksiteList.findIndex(function (item) {
|
_this2.worksiteIndex = _this2.worksiteList.findIndex(function (item) {
|
||||||
return item.id === uni.getStorageSync('worksite_id');
|
return item.id === uni.getStorageSync('worksite_id');
|
||||||
});
|
});
|
||||||
} else if (uni.getStorageSync('baseWorksiteId') !== 0) {
|
} else if (uni.getStorageSync('baseWorksiteId') !== 0) {
|
||||||
_this.worksiteIndex = _this.worksiteList.findIndex(function (item) {
|
_this2.worksiteIndex = _this2.worksiteList.findIndex(function (item) {
|
||||||
return item.id === uni.getStorageSync('baseWorksiteId');
|
return item.id === uni.getStorageSync('baseWorksiteId');
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
_this.worksiteIndex = -1;
|
_this2.worksiteIndex = -1;
|
||||||
}
|
}
|
||||||
_this.isLoding = true;
|
_this2.isLoding = true;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
@ -304,7 +307,7 @@ var _default = {
|
||||||
},
|
},
|
||||||
// 确认补卡
|
// 确认补卡
|
||||||
submitEv: function submitEv() {
|
submitEv: function submitEv() {
|
||||||
var _this2 = this;
|
var _this3 = this;
|
||||||
var params = {
|
var params = {
|
||||||
day: this.curDate,
|
day: this.curDate,
|
||||||
worksite_id: this.worksiteIndex !== -1 ? this.worksiteList[this.worksiteIndex].id : 0,
|
worksite_id: this.worksiteIndex !== -1 ? this.worksiteList[this.worksiteIndex].id : 0,
|
||||||
|
@ -312,27 +315,29 @@ var _default = {
|
||||||
};
|
};
|
||||||
this.$requst.post('/api/v1/user/replenish', params).then(function (res) {
|
this.$requst.post('/api/v1/user/replenish', params).then(function (res) {
|
||||||
if (res.code == 0) {
|
if (res.code == 0) {
|
||||||
_this2.$toolAll.tools.showToast('补卡成功');
|
_this3.$toolAll.tools.showToast('补卡成功');
|
||||||
_this2.showCard = false;
|
_this3.showCard = false;
|
||||||
// 获取状态列表
|
// 获取状态列表
|
||||||
_this2.$refs.signCalendar.getStatusObj();
|
_this3.$refs.signCalendar.getStatusObj(_this3.worksiteList[_this3.worksiteIndex].id);
|
||||||
} else {
|
} else {
|
||||||
_this2.$toolAll.tools.showToast(res.msg);
|
_this3.$toolAll.tools.showToast(res.msg);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
// 获取打卡列表
|
// 获取打卡列表
|
||||||
getSignList: function getSignList() {
|
getSignList: function getSignList() {
|
||||||
var _this3 = this;
|
var _this4 = this;
|
||||||
this.$requst.get('/api/v1/user/sign-today', {
|
var params = {
|
||||||
day: this.curDate
|
day: this.curDate,
|
||||||
}).then(function (res) {
|
worksite_id: this.worksiteIndex !== -1 ? this.worksiteList[this.worksiteIndex].id : 0
|
||||||
|
};
|
||||||
|
this.$requst.get('/api/v1/user/sign-today', params).then(function (res) {
|
||||||
if (res.code == 0) {
|
if (res.code == 0) {
|
||||||
console.log(res, '打卡记录');
|
console.log(res, '打卡记录');
|
||||||
// 获取打卡状态
|
// 获取打卡状态
|
||||||
_this3.buttonColor = res.data.buttonColor;
|
_this4.buttonColor = res.data.buttonColor;
|
||||||
// 获取打卡记录列表
|
// 获取打卡记录列表
|
||||||
_this3.signList = res.data.list;
|
_this4.signList = res.data.list;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
@ -342,6 +347,8 @@ var _default = {
|
||||||
this.page = 1;
|
this.page = 1;
|
||||||
// 获取打卡列表
|
// 获取打卡列表
|
||||||
this.getSignList();
|
this.getSignList();
|
||||||
|
// 获取状态列表
|
||||||
|
this.$refs.signCalendar.getStatusObj(this.worksiteList[this.worksiteIndex].id);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
<view class="pad-x120 data-v-8835a436"><status-nav vue-id="7e7de07e-1" navBarTitle="工资记录" class="data-v-8835a436" bind:__l="__l"></status-nav><view class="content data-v-8835a436" style="{{'padding-top:'+(statusHeight+50+'px')+';'}}"><view class="sign-record sign-record-other bg-white data-v-8835a436"><block wx:for="{{wagesList}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view class="item font26 data-v-8835a436"><view class="info info-other data-v-8835a436"><text class="data-v-8835a436">{{item.date}}</text><text class="{{['data-v-8835a436',item.status==0?'color-blue':'color-66']}}">{{item.status_text}}</text></view><view class="wages-info data-v-8835a436"><view class="text data-v-8835a436">{{"基本工资:"+item.base_amount+"元"}}</view><view class="text data-v-8835a436">{{"加班工资:"+item.overtime_amount+"元"}}</view><view class="text data-v-8835a436">合计:<text class="font32 data-v-8835a436">{{item.amount}}</text>元</view></view></view></block></view><view class="more-tips font24 data-v-8835a436">{{$root.g0==total?'没有更多数据了':'下滑获取更多'}}</view></view><tabbar vue-id="7e7de07e-2" userType="{{userType}}" current="2" class="data-v-8835a436" bind:__l="__l"></tabbar></view>
|
<view class="pad-x120 data-v-8835a436"><status-nav vue-id="7e7de07e-1" navBarTitle="工资记录" class="data-v-8835a436" bind:__l="__l"></status-nav><view class="content data-v-8835a436" style="{{'padding-top:'+(statusHeight+50+'px')+';'}}"><view class="sign-record sign-record-other bg-white data-v-8835a436"><block wx:for="{{wagesList}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view class="item font26 data-v-8835a436"><view class="info info-other data-v-8835a436"><text class="data-v-8835a436">{{item.date}}</text><block wx:if="{{item.status==2}}"><text class="color-66 data-v-8835a436">{{"部分发放:"+item.paid_amount+"元"}}</text></block><block wx:else><text class="{{['data-v-8835a436',item.status==0?'color-blue':'color-66']}}">{{item.status==0?'待发放':'已发放'}}</text></block></view><view class="wages-info data-v-8835a436"><view class="text data-v-8835a436">{{"基本工资:"+item.base_amount+"元"}}</view><view class="text data-v-8835a436">{{"加班工资:"+item.overtime_amount+"元"}}</view><view class="text data-v-8835a436">合计:<text class="font32 data-v-8835a436">{{item.amount}}</text>元</view></view></view></block></view><view class="more-tips font24 data-v-8835a436">{{$root.g0==total?'没有更多数据了':'下滑获取更多'}}</view></view><tabbar vue-id="7e7de07e-2" userType="{{userType}}" current="2" class="data-v-8835a436" bind:__l="__l"></tabbar></view>
|
Loading…
Reference in New Issue