Merge branch 'zgs' into 'main'
Zgs See merge request hzd/salaryAccounting!2
This commit is contained in:
+4
-2
@@ -1,4 +1,6 @@
|
|||||||
|
|
||||||
// 肖兴越开发环境
|
// 肖兴越开发环境
|
||||||
const baseUrl = "https://paystubs.vip.cpolar.top"
|
// const baseUrl = "https://paystubs.vip.cpolar.top"
|
||||||
|
// 上线生产环境
|
||||||
|
const baseUrl = "https://payroll.scdswj.cn/prod-api"
|
||||||
|
|
||||||
export default baseUrl
|
export default baseUrl
|
||||||
+29
-8
@@ -1,31 +1,52 @@
|
|||||||
/*首页*/
|
/*首页*/
|
||||||
import { request, requestLogin } from "./index.js";
|
import {
|
||||||
|
request,
|
||||||
|
requestLogin
|
||||||
|
} from "./index.js";
|
||||||
|
|
||||||
// 登录
|
// 登录
|
||||||
export function getToken(authCode){
|
export function getToken(authCode) {
|
||||||
return requestLogin({
|
return requestLogin({
|
||||||
method: "GET",
|
method: "GET",
|
||||||
url: `/login?code=${authCode}`,
|
url: `/login?code=${authCode}`,
|
||||||
data: {
|
data: {},
|
||||||
},
|
|
||||||
Header1: {
|
Header1: {
|
||||||
|
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
// 获取用户信息
|
// 获取用户信息
|
||||||
export function getUser(authCode){
|
export function getUser(authCode) {
|
||||||
return request({
|
return request({
|
||||||
method: "get",
|
method: "get",
|
||||||
url: "/user",
|
url: "/user",
|
||||||
data: {
|
data: {},
|
||||||
},
|
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
// 获取绩效考勤统计
|
// 获取绩效考勤统计
|
||||||
export function getPerformanceAttendanceApi(year,month){
|
export function getPerformanceAttendanceApi(year, month) {
|
||||||
return request({
|
return request({
|
||||||
method: "get",
|
method: "get",
|
||||||
url: `/performance/attendance/detail/${year}/${month}`,
|
url: `/performance/attendance/detail/${year}/${month}`,
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 工资条查询
|
||||||
|
export function getPayrollSheets(year, month) {
|
||||||
|
return request({
|
||||||
|
method: "get",
|
||||||
|
url: `/payroll/sheets/detail/${year}/${month}`,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
// 签字提交
|
||||||
|
export function signatureOfMeetingMinutesApi(data) {
|
||||||
|
return request({
|
||||||
|
method: "post",
|
||||||
|
url: `/performance/attendance/emp/approve`,
|
||||||
|
data: data,
|
||||||
|
header: {
|
||||||
|
'content-type': 'application/json' // 设置请求头为 JSON 格式
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
+80
-38
@@ -1,13 +1,17 @@
|
|||||||
|
|
||||||
import allUrl from "./baseUrl.js"
|
import allUrl from "./baseUrl.js"
|
||||||
// const baseUrl = bootUrl
|
// const baseUrl = bootUrl
|
||||||
export function request ( optaions ) {
|
export function request(optaions) {
|
||||||
let { url, method, data, header1 } = optaions
|
let {
|
||||||
|
url,
|
||||||
|
method,
|
||||||
|
data,
|
||||||
|
header1
|
||||||
|
} = optaions
|
||||||
method = method || "GET"
|
method = method || "GET"
|
||||||
data = data || {}
|
data = data || {}
|
||||||
let newData = {}
|
let newData = {}
|
||||||
for( let key in data){
|
for (let key in data) {
|
||||||
if( data[key] !== null && data[key] !== ''){
|
if (data[key] !== null && data[key] !== '') {
|
||||||
newData[key] = data[key]
|
newData[key] = data[key]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -15,54 +19,77 @@ export function request ( optaions ) {
|
|||||||
header1 = header1 || {
|
header1 = header1 || {
|
||||||
Authorization: 'Bearer ' + uni.getStorageSync('token')
|
Authorization: 'Bearer ' + uni.getStorageSync('token')
|
||||||
}
|
}
|
||||||
return new Promise((reslove,reject)=>{
|
return new Promise((reslove, reject) => {
|
||||||
uni.request({
|
uni.request({
|
||||||
url: allUrl + url,
|
url: allUrl + url,
|
||||||
method,
|
method,
|
||||||
header: header1,
|
header: header1,
|
||||||
data,
|
data,
|
||||||
success: (res) => {
|
success: (res) => {
|
||||||
if(res.data.errcode == 401 ){
|
if (res.data.errcode == 401) {
|
||||||
uni.showToast({ title: '登录已失效,即将重新登录!', icon: 'none' });
|
uni.showToast({
|
||||||
|
title: '登录已失效,即将重新登录!',
|
||||||
|
icon: 'none'
|
||||||
|
});
|
||||||
uni.removeStorageSync('userInfo');
|
uni.removeStorageSync('userInfo');
|
||||||
uni.removeStorageSync('token');
|
uni.removeStorageSync('token');
|
||||||
setTimeout(()=>{
|
setTimeout(() => {
|
||||||
uni.reLaunch({ url: '/pages/newHomePage/newHomePage' });
|
uni.reLaunch({
|
||||||
|
url: '/pages/homePage/homePage'
|
||||||
|
});
|
||||||
}, 1000);
|
}, 1000);
|
||||||
}else if(res.data.errcode != 0){
|
} else if (res.data.errcode != 0) {
|
||||||
console.log('不正确走的')
|
console.log('不正确走的')
|
||||||
reject(res)
|
reject(res)
|
||||||
uni.showToast({ title: res.data.errmsg, icon: 'none', duration: 2000 });
|
uni.showToast({
|
||||||
}else {
|
title: res.data.errmsg,
|
||||||
|
icon: 'none',
|
||||||
|
duration: 2000
|
||||||
|
});
|
||||||
|
} else {
|
||||||
reslove(res.data)
|
reslove(res.data)
|
||||||
}
|
}
|
||||||
|
|
||||||
},
|
},
|
||||||
fail: (err) => {
|
fail: (err) => {
|
||||||
console.log('请求失败',err)
|
console.log('请求失败', err)
|
||||||
uni.hideLoading()
|
uni.hideLoading()
|
||||||
if(err.statusCode == 401 ){
|
if (err.statusCode == 401) {
|
||||||
uni.showToast({ title: '登录已失效,即将重新登录!', icon: 'none' });
|
uni.showToast({
|
||||||
|
title: '登录已失效,即将重新登录!',
|
||||||
|
icon: 'none'
|
||||||
|
});
|
||||||
uni.removeStorageSync('userInfo');
|
uni.removeStorageSync('userInfo');
|
||||||
uni.removeStorageSync('token');
|
uni.removeStorageSync('token');
|
||||||
setTimeout(()=>{
|
setTimeout(() => {
|
||||||
uni.reLaunch({ url: '/pages/newHomePage/newHomePage' });
|
uni.reLaunch({
|
||||||
|
url: '/pages/homePage/homePage'
|
||||||
|
});
|
||||||
}, 1000);
|
}, 1000);
|
||||||
}
|
}
|
||||||
if(err.data.errcode == 401 ){
|
if (err.data.errcode == 401) {
|
||||||
uni.showToast({ title: '登录已失效,即将重新登录!', icon: 'none' });
|
uni.showToast({
|
||||||
|
title: '登录已失效,即将重新登录!',
|
||||||
|
icon: 'none'
|
||||||
|
});
|
||||||
uni.removeStorageSync('userInfo');
|
uni.removeStorageSync('userInfo');
|
||||||
uni.removeStorageSync('token');
|
uni.removeStorageSync('token');
|
||||||
setTimeout(()=>{
|
|
||||||
uni.reLaunch({ url: '/pages/newHomePage/newHomePage' });
|
setTimeout(() => {
|
||||||
|
uni.reLaunch({
|
||||||
|
url: '/pages/homePage/homePage'
|
||||||
|
});
|
||||||
}, 1000);
|
}, 1000);
|
||||||
}else{
|
} else {
|
||||||
uni.showToast({ title: err.data.errmsg, icon: 'none' });
|
uni.showToast({
|
||||||
|
title: err.data.errmsg,
|
||||||
|
icon: 'none'
|
||||||
|
});
|
||||||
}
|
}
|
||||||
reject()
|
reject()
|
||||||
},
|
},
|
||||||
complete: () => {
|
complete: () => {
|
||||||
setTimeout(()=>{
|
setTimeout(() => {
|
||||||
uni.hideLoading()
|
uni.hideLoading()
|
||||||
}, 2000)
|
}, 2000)
|
||||||
}
|
}
|
||||||
@@ -71,34 +98,49 @@ export function request ( optaions ) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
export function requestLogin ( optaions ) {
|
export function requestLogin(optaions) {
|
||||||
let { url, method, data } = optaions
|
let {
|
||||||
|
url,
|
||||||
|
method,
|
||||||
|
data,
|
||||||
|
header
|
||||||
|
} = optaions
|
||||||
method = method || "GET"
|
method = method || "GET"
|
||||||
data = data || {}
|
data = data || {}
|
||||||
let newData = {}
|
let newData = {}
|
||||||
for( let key in data){
|
for (let key in data) {
|
||||||
if( data[key] !== null && data[key] !== ''){
|
if (data[key] !== null && data[key] !== '') {
|
||||||
newData[key] = data[key]
|
newData[key] = data[key]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
data = newData || {}
|
data = newData || {}
|
||||||
return new Promise((reslove,reject)=>{
|
return new Promise((reslove, reject) => {
|
||||||
uni.request({
|
uni.request({
|
||||||
url: allUrl + url,
|
url: allUrl + url,
|
||||||
method,
|
method,
|
||||||
data,
|
data,
|
||||||
|
header,
|
||||||
success: (res) => {
|
success: (res) => {
|
||||||
if(res.statusCode == 401 ){
|
if (res.statusCode == 401) {
|
||||||
uni.showToast({ title: '登录已失效,即将返回首页!', icon: 'none' });
|
uni.showToast({
|
||||||
|
title: '登录已失效,即将返回首页!',
|
||||||
|
icon: 'none'
|
||||||
|
});
|
||||||
uni.removeStorageSync('userInfo');
|
uni.removeStorageSync('userInfo');
|
||||||
uni.removeStorageSync('token');
|
uni.removeStorageSync('token');
|
||||||
setTimeout(()=>{
|
// setTimeout(() => {
|
||||||
uni.reLaunch({ url: '/pages/newHomePage/newHomePage' });
|
// uni.reLaunch({
|
||||||
}, 1000);
|
// url: '/pages/homePage/homePage'
|
||||||
}else if(res.statusCode != 200){
|
// });
|
||||||
|
// }, 1000);
|
||||||
|
} else if (res.statusCode != 200) {
|
||||||
reject(res)
|
reject(res)
|
||||||
uni.showToast({ title: res.data.msg, icon: 'none', duration: 2000 });
|
uni.showToast({
|
||||||
}else {
|
title: res.data.msg,
|
||||||
|
icon: 'none',
|
||||||
|
duration: 2000
|
||||||
|
});
|
||||||
|
} else {
|
||||||
reslove(res.data)
|
reslove(res.data)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -2,14 +2,19 @@ import App from './App'
|
|||||||
import Inputli from './components/form/input-li.vue';
|
import Inputli from './components/form/input-li.vue';
|
||||||
import Selectli from './components/form/select-li.vue';
|
import Selectli from './components/form/select-li.vue';
|
||||||
import Dateli from './components/form/date-li.vue';
|
import Dateli from './components/form/date-li.vue';
|
||||||
import { getToken,getUser } from './api/create.js'
|
import {
|
||||||
import { formatDate, calculator } from './com/index.js'
|
getToken,
|
||||||
|
getUser
|
||||||
|
} from './api/create.js'
|
||||||
|
import {
|
||||||
|
formatDate,
|
||||||
|
calculator
|
||||||
|
} from './com/index.js'
|
||||||
// #ifndef VUE3
|
// #ifndef VUE3
|
||||||
import Vue from 'vue'
|
import Vue from 'vue'
|
||||||
Vue.config.productionTip = false
|
Vue.config.productionTip = false
|
||||||
Vue.prototype.a = '1234456'
|
Vue.prototype.a = '1234456'
|
||||||
const msg = (title,icon = 'none', duration = 1500, mask = false, ) => {
|
const msg = (title, icon = 'none', duration = 1500, mask = false, ) => {
|
||||||
//统一提示方便全局修改
|
//统一提示方便全局修改
|
||||||
if (Boolean(title) === false) {
|
if (Boolean(title) === false) {
|
||||||
return;
|
return;
|
||||||
@@ -22,13 +27,13 @@ const msg = (title,icon = 'none', duration = 1500, mask = false, ) => {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
const setNavigationBar = ( title = '教育平台', backgroundColor = '#ffffff') =>{
|
const setNavigationBar = (title = '教育平台', backgroundColor = '#ffffff') => {
|
||||||
my.setNavigationBar({
|
my.setNavigationBar({
|
||||||
title,
|
title,
|
||||||
backgroundColor
|
backgroundColor
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
const navTo = (url, skip = 'navigateTo') =>{
|
const navTo = (url, skip = 'navigateTo') => {
|
||||||
uni[skip]({
|
uni[skip]({
|
||||||
url
|
url
|
||||||
});
|
});
|
||||||
@@ -46,7 +51,7 @@ const login = () => {
|
|||||||
uni.setStorageSync('token', res.result.token)
|
uni.setStorageSync('token', res.result.token)
|
||||||
getUser().then(data => {
|
getUser().then(data => {
|
||||||
console.log(data)
|
console.log(data)
|
||||||
uni.setStorageSync('user',data)
|
uni.setStorageSync('user', data)
|
||||||
uni.hideLoading()
|
uni.hideLoading()
|
||||||
// uni.showToast({
|
// uni.showToast({
|
||||||
// title: '登录成功',
|
// title: '登录成功',
|
||||||
@@ -67,14 +72,14 @@ const login = () => {
|
|||||||
|
|
||||||
}
|
}
|
||||||
// 提示框 点击确定进入resolve 取消进入reject
|
// 提示框 点击确定进入resolve 取消进入reject
|
||||||
const showModel = (content) =>{
|
const showModel = (content) => {
|
||||||
return new Promise((resolve, reject)=>{
|
return new Promise((resolve, reject) => {
|
||||||
uni.showModal({
|
uni.showModal({
|
||||||
title: '提示',
|
title: '提示',
|
||||||
content: content,
|
content: content,
|
||||||
cancelText: '取消',
|
cancelText: '取消',
|
||||||
confirmText: '确定',
|
confirmText: '确定',
|
||||||
success: function (res) {
|
success: function(res) {
|
||||||
if (res.confirm) {
|
if (res.confirm) {
|
||||||
console.log('用户点击确定');
|
console.log('用户点击确定');
|
||||||
resolve('affirm')
|
resolve('affirm')
|
||||||
@@ -97,9 +102,9 @@ Vue.prototype.$showModel = showModel // 提示框
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
Vue.component("Inputli",Inputli)
|
Vue.component("Inputli", Inputli)
|
||||||
Vue.component("Selectli",Selectli)
|
Vue.component("Selectli", Selectli)
|
||||||
Vue.component("Dateli",Dateli)
|
Vue.component("Dateli", Dateli)
|
||||||
|
|
||||||
App.mpType = 'app'
|
App.mpType = 'app'
|
||||||
const app = new Vue({
|
const app = new Vue({
|
||||||
@@ -112,7 +117,9 @@ app.$mount()
|
|||||||
|
|
||||||
|
|
||||||
// #ifdef VUE3
|
// #ifdef VUE3
|
||||||
import { createSSRApp } from 'vue'
|
import {
|
||||||
|
createSSRApp
|
||||||
|
} from 'vue'
|
||||||
export function createApp() {
|
export function createApp() {
|
||||||
const app = createSSRApp(App)
|
const app = createSSRApp(App)
|
||||||
return {
|
return {
|
||||||
|
|||||||
+37
-37
@@ -1,29 +1,28 @@
|
|||||||
{
|
{
|
||||||
"name": "template",
|
"name" : "template",
|
||||||
"appid": "__UNI__9F20DF1",
|
"appid" : "__UNI__9F20DF1",
|
||||||
"description": "",
|
"description" : "",
|
||||||
"versionName": "1.0.0",
|
"versionName" : "1.0.0",
|
||||||
"versionCode": "100",
|
"versionCode" : "100",
|
||||||
"transformPx": false,
|
"transformPx" : false,
|
||||||
/* 5+App特有相关 */
|
/* 5+App特有相关 */
|
||||||
"app-plus": {
|
"app-plus" : {
|
||||||
"usingComponents": true,
|
"usingComponents" : true,
|
||||||
"nvueStyleCompiler": "uni-app",
|
"nvueStyleCompiler" : "uni-app",
|
||||||
"compilerVersion": 3,
|
"compilerVersion" : 3,
|
||||||
|
"splashscreen" : {
|
||||||
"splashscreen": {
|
"alwaysShowBeforeRender" : true,
|
||||||
"alwaysShowBeforeRender": true,
|
"waiting" : true,
|
||||||
"waiting": true,
|
"autoclose" : true,
|
||||||
"autoclose": true,
|
"delay" : 0
|
||||||
"delay": 0
|
|
||||||
},
|
},
|
||||||
/* 模块配置 */
|
/* 模块配置 */
|
||||||
"modules": {},
|
"modules" : {},
|
||||||
/* 应用发布信息 */
|
/* 应用发布信息 */
|
||||||
"distribute": {
|
"distribute" : {
|
||||||
/* android打包配置 */
|
/* android打包配置 */
|
||||||
"android": {
|
"android" : {
|
||||||
"permissions": [
|
"permissions" : [
|
||||||
"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
|
"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
|
||||||
"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
|
"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
|
||||||
"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
|
"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
|
||||||
@@ -42,32 +41,33 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
/* ios打包配置 */
|
/* ios打包配置 */
|
||||||
"ios": {},
|
"ios" : {},
|
||||||
/* SDK配置 */
|
/* SDK配置 */
|
||||||
"sdkConfigs": {}
|
"sdkConfigs" : {}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
/* 快应用特有相关 */
|
/* 快应用特有相关 */
|
||||||
"quickapp": {},
|
"quickapp" : {},
|
||||||
/* 小程序特有相关 */
|
/* 小程序特有相关 */
|
||||||
"mp-weixin": {
|
"mp-weixin" : {
|
||||||
"appid": "",
|
"appid" : "",
|
||||||
"setting": {
|
"setting" : {
|
||||||
"urlCheck": false
|
"urlCheck" : false
|
||||||
},
|
},
|
||||||
"usingComponents": true
|
"usingComponents" : true
|
||||||
},
|
},
|
||||||
"mp-alipay": {
|
"mp-alipay" : {
|
||||||
"usingComponents": true
|
"usingComponents" : true,
|
||||||
|
"appid" : "3898417134"
|
||||||
},
|
},
|
||||||
"mp-baidu": {
|
"mp-baidu" : {
|
||||||
"usingComponents": true
|
"usingComponents" : true
|
||||||
},
|
},
|
||||||
"mp-toutiao": {
|
"mp-toutiao" : {
|
||||||
"usingComponents": true
|
"usingComponents" : true
|
||||||
},
|
},
|
||||||
"uniStatistics": {
|
"uniStatistics" : {
|
||||||
"enable": false
|
"enable" : false
|
||||||
},
|
},
|
||||||
"vueVersion": "2"
|
"vueVersion" : "2"
|
||||||
}
|
}
|
||||||
|
|||||||
Generated
+17
@@ -0,0 +1,17 @@
|
|||||||
|
{
|
||||||
|
"name": "salaryAccounting",
|
||||||
|
"lockfileVersion": 3,
|
||||||
|
"requires": true,
|
||||||
|
"packages": {
|
||||||
|
"": {
|
||||||
|
"dependencies": {
|
||||||
|
"mini-smooth-signature": "^1.2.3"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/mini-smooth-signature": {
|
||||||
|
"version": "1.2.3",
|
||||||
|
"resolved": "https://registry.npmmirror.com/mini-smooth-signature/-/mini-smooth-signature-1.2.3.tgz",
|
||||||
|
"integrity": "sha512-T/ZYnjqdXM11n6GQ29XG5PRXeoq1LFJMWlcc/EljJUVM2J00RF1ffnX5+4XKbUMymH/TNQF9mBhAU1cPXiKQlw=="
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -3,12 +3,15 @@
|
|||||||
<!-- 月份选择 -->
|
<!-- 月份选择 -->
|
||||||
<view class="month-selector" @click="showDatePicker">
|
<view class="month-selector" @click="showDatePicker">
|
||||||
<view class="combination">
|
<view class="combination">
|
||||||
<text class="current-month">{{ selectedYear }}年{{ selectedMonth < 10 ? '0' + selectedMonth : selectedMonth }}月</text>
|
<text
|
||||||
|
class="current-month">{{ selectedYear }}年{{ selectedMonth < 10 ? '0' + selectedMonth : selectedMonth }}月</text>
|
||||||
<image class="arrow" src="/static/arr.png" mode="aspectFit"></image>
|
<image class="arrow" src="/static/arr.png" mode="aspectFit"></image>
|
||||||
</view>
|
</view>
|
||||||
<text class="month-text">月度</text>
|
<text class="month-text">月度</text>
|
||||||
</view>
|
</view>
|
||||||
|
<!-- 内容 -->
|
||||||
|
<view class="box" v-for="(attendanceData,index) in attendanceDataList" :key="index">
|
||||||
|
<view class="title">{{attendanceData.status=="1"?"试用":"正式"}}</view>
|
||||||
<!-- 打卡统计 -->
|
<!-- 打卡统计 -->
|
||||||
<view class="stat-section">
|
<view class="stat-section">
|
||||||
<view class="section-title">打卡统计</view>
|
<view class="section-title">打卡统计</view>
|
||||||
@@ -108,20 +111,31 @@
|
|||||||
|
|
||||||
<!-- 底部说明 -->
|
<!-- 底部说明 -->
|
||||||
<view class="bottom-tips">说明:请核实当月考勤记录,确认无误请签字确认</view>
|
<view class="bottom-tips">说明:请核实当月考勤记录,确认无误请签字确认</view>
|
||||||
|
|
||||||
<!-- 员工签字 -->
|
<!-- 员工签字 -->
|
||||||
|
|
||||||
<view class="sign">
|
<view class="sign" v-if="attendanceData.signatureImg">
|
||||||
<view class="sign-tit">
|
<view class="sign-tit">
|
||||||
员工签字
|
员工签字
|
||||||
<text>/保留员工签字</text>
|
<text>/保留员工签字</text>
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
<view class="signatureVersion"></view>
|
<view class="signatureVersion">
|
||||||
|
<image :src="attendanceData.signatureImg" class="signImg" mode="scaleToFill">
|
||||||
|
</image>
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
|
<!-- 签字确认按钮 -->
|
||||||
|
<view class=" confirm-btn" v-if="attendanceData.flag=='7'" @click="goSignIt(attendanceData)">
|
||||||
|
<text>签字确认</text>
|
||||||
|
</view>
|
||||||
|
<!-- <view class=" confirm-btn" @click="goSignIt(attendanceData)">
|
||||||
|
<text>签字确认</text>
|
||||||
|
</view> -->
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
<!-- 签字确认按钮 -->
|
|
||||||
<view class="confirm-btn" @click="goSignIt"><text>签字确认</text></view>
|
|
||||||
|
|
||||||
|
|
||||||
<!-- 日期选择模态框 -->
|
<!-- 日期选择模态框 -->
|
||||||
<view class="date-picker-modal" v-if="showModal" @click.stop="closeDatePicker">
|
<view class="date-picker-modal" v-if="showModal" @click.stop="closeDatePicker">
|
||||||
@@ -130,7 +144,8 @@
|
|||||||
|
|
||||||
<!-- 年份选择 -->
|
<!-- 年份选择 -->
|
||||||
<view class="year-grid" v-if="currentStep === 'year'">
|
<view class="year-grid" v-if="currentStep === 'year'">
|
||||||
<view v-for="year in availableYears" :key="year" class="year-item" :class="{ active: tempSelectedYear === year }" @click="selectYear(year)">
|
<view v-for="year in availableYears" :key="year" class="year-item"
|
||||||
|
:class="{ active: tempSelectedYear === year }" @click="selectYear(year)">
|
||||||
<view class="year-circle">
|
<view class="year-circle">
|
||||||
<text>{{ year }}年</text>
|
<text>{{ year }}年</text>
|
||||||
</view>
|
</view>
|
||||||
@@ -139,7 +154,8 @@
|
|||||||
|
|
||||||
<!-- 月份选择 -->
|
<!-- 月份选择 -->
|
||||||
<view class="month-grid" v-if="currentStep === 'month'">
|
<view class="month-grid" v-if="currentStep === 'month'">
|
||||||
<view v-for="month in months" :key="month" class="month-item" :class="{ active: tempSelectedMonth === month }" @click="selectMonth(month)">
|
<view v-for="month in months" :key="month" class="month-item"
|
||||||
|
:class="{ active: tempSelectedMonth === month }" @click="selectMonth(month)">
|
||||||
<view class="month-circle">
|
<view class="month-circle">
|
||||||
<text>{{ tempSelectedYear }}年{{ month < 10 ? '0' + month : month }}月</text>
|
<text>{{ tempSelectedYear }}年{{ month < 10 ? '0' + month : month }}月</text>
|
||||||
</view>
|
</view>
|
||||||
@@ -147,15 +163,19 @@
|
|||||||
</view>
|
</view>
|
||||||
|
|
||||||
<!-- 底部按钮 -->
|
<!-- 底部按钮 -->
|
||||||
<view class="modal-footer" v-if="currentStep === 'month'"><view class="back-btn" @click="backToYearSelect">返回年份选择</view></view>
|
<view class="modal-footer" v-if="currentStep === 'month'">
|
||||||
|
<view class="back-btn" @click="backToYearSelect">返回年份选择</view>
|
||||||
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
import { getPerformanceAttendanceApi } from '@/api/create.js';
|
import {
|
||||||
export default {
|
getPerformanceAttendanceApi
|
||||||
|
} from '@/api/create.js';
|
||||||
|
export default {
|
||||||
data() {
|
data() {
|
||||||
const currentDate = new Date();
|
const currentDate = new Date();
|
||||||
const currentYear = currentDate.getFullYear();
|
const currentYear = currentDate.getFullYear();
|
||||||
@@ -164,12 +184,16 @@ export default {
|
|||||||
currentYear,
|
currentYear,
|
||||||
selectedYear: currentYear,
|
selectedYear: currentYear,
|
||||||
selectedMonth: currentDate.getMonth(),
|
selectedMonth: currentDate.getMonth(),
|
||||||
months: Array.from({ length: 12 }, (_, i) => i + 1),
|
months: Array.from({
|
||||||
|
length: 12
|
||||||
|
}, (_, i) => i + 1),
|
||||||
currentStep: 'year', // 'year' 或 'month'
|
currentStep: 'year', // 'year' 或 'month'
|
||||||
tempSelectedYear: currentYear,
|
tempSelectedYear: currentYear,
|
||||||
tempSelectedMonth: currentDate.getMonth() + 1,
|
tempSelectedMonth: currentDate.getMonth() + 1,
|
||||||
availableYears: Array.from({ length: 7 }, (_, i) => currentYear - 3 + i),
|
availableYears: Array.from({
|
||||||
attendanceData: {
|
length: 7
|
||||||
|
}, (_, i) => currentYear - 3 + i),
|
||||||
|
attendanceDataList: [{
|
||||||
// 迟到
|
// 迟到
|
||||||
late: ' ',
|
late: ' ',
|
||||||
// 严重迟到
|
// 严重迟到
|
||||||
@@ -209,10 +233,11 @@ export default {
|
|||||||
restdayOvertime: ' ',
|
restdayOvertime: ' ',
|
||||||
// 工作日加班
|
// 工作日加班
|
||||||
workdayOvertime: ' '
|
workdayOvertime: ' '
|
||||||
}
|
}]
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
created() {
|
|
||||||
|
onShow() {
|
||||||
this.getPerformanceAttendance();
|
this.getPerformanceAttendance();
|
||||||
this.$setNavigationBar('考勤管理');
|
this.$setNavigationBar('考勤管理');
|
||||||
},
|
},
|
||||||
@@ -246,8 +271,8 @@ export default {
|
|||||||
backToYearSelect() {
|
backToYearSelect() {
|
||||||
this.currentStep = 'year';
|
this.currentStep = 'year';
|
||||||
},
|
},
|
||||||
goSignIt() {
|
goSignIt(attendanceData) {
|
||||||
this.$navTo('/pages/sign/sign');
|
this.$navTo('/pages/sign/sign?id=' + attendanceData.id);
|
||||||
},
|
},
|
||||||
async getPerformanceAttendance() {
|
async getPerformanceAttendance() {
|
||||||
uni.showLoading({
|
uni.showLoading({
|
||||||
@@ -256,15 +281,31 @@ export default {
|
|||||||
})
|
})
|
||||||
|
|
||||||
let res = await getPerformanceAttendanceApi(this.selectedYear, this.selectedMonth);
|
let res = await getPerformanceAttendanceApi(this.selectedYear, this.selectedMonth);
|
||||||
this.attendanceData = res.result;
|
|
||||||
uni.hideLoading();
|
uni.hideLoading();
|
||||||
|
if (res.result.length) {
|
||||||
|
this.attendanceDataList = res.result;
|
||||||
|
} else {
|
||||||
|
uni.showModal({
|
||||||
|
title: '温馨提示',
|
||||||
|
content: '暂无相关数据',
|
||||||
|
showCancel: false,
|
||||||
|
confirmText: "确定",
|
||||||
|
success: function(res) {
|
||||||
|
if (res.confirm) {
|
||||||
|
uni.navigateBack({
|
||||||
|
delta: 1
|
||||||
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
};
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style lang="scss" scoped>
|
<style lang="scss" scoped>
|
||||||
.attendance-page {
|
.attendance-page {
|
||||||
min-height: 100vh;
|
min-height: 100vh;
|
||||||
background-color: #f8f9fa;
|
background-color: #f8f9fa;
|
||||||
padding: 0 30rpx 0 30rpx;
|
padding: 0 30rpx 0 30rpx;
|
||||||
@@ -275,11 +316,13 @@ export default {
|
|||||||
align-items: center;
|
align-items: center;
|
||||||
margin: 40rpx 0;
|
margin: 40rpx 0;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
|
|
||||||
.combination {
|
.combination {
|
||||||
height: 40rpx;
|
height: 40rpx;
|
||||||
line-height: 40rpx;
|
line-height: 40rpx;
|
||||||
display: flex;
|
display: flex;
|
||||||
align-content: center;
|
align-content: center;
|
||||||
|
|
||||||
.current-month {
|
.current-month {
|
||||||
font-family: Source Han Sans CN, Source Han Sans CN;
|
font-family: Source Han Sans CN, Source Han Sans CN;
|
||||||
font-weight: 400;
|
font-weight: 400;
|
||||||
@@ -302,11 +345,18 @@ export default {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.box {
|
||||||
|
.title {
|
||||||
|
padding-bottom: 28rpx;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
.stat-section {
|
.stat-section {
|
||||||
background: #fff;
|
background: #fff;
|
||||||
border-radius: 12rpx;
|
border-radius: 12rpx;
|
||||||
padding: 35rpx 40rpx;
|
padding: 35rpx 40rpx;
|
||||||
margin-bottom: 20rpx;
|
margin-bottom: 20rpx;
|
||||||
|
|
||||||
.section-title {
|
.section-title {
|
||||||
font-size: 32rpx;
|
font-size: 32rpx;
|
||||||
color: #111827;
|
color: #111827;
|
||||||
@@ -332,6 +382,7 @@ export default {
|
|||||||
.value {
|
.value {
|
||||||
font-size: 32rpx;
|
font-size: 32rpx;
|
||||||
color: #666;
|
color: #666;
|
||||||
|
|
||||||
&.red-text {
|
&.red-text {
|
||||||
color: #ff4d4f;
|
color: #ff4d4f;
|
||||||
}
|
}
|
||||||
@@ -346,9 +397,11 @@ export default {
|
|||||||
font-size: 24rpx;
|
font-size: 24rpx;
|
||||||
color: #b9b9c2;
|
color: #b9b9c2;
|
||||||
}
|
}
|
||||||
|
|
||||||
.sign {
|
.sign {
|
||||||
margin-top: 32rpx;
|
margin-top: 32rpx;
|
||||||
margin-bottom: 180rpx;
|
margin-bottom: 32rpx;
|
||||||
|
|
||||||
.sign-tit {
|
.sign-tit {
|
||||||
margin-bottom: 32rpx;
|
margin-bottom: 32rpx;
|
||||||
margin-left: 8rpx;
|
margin-left: 8rpx;
|
||||||
@@ -356,6 +409,7 @@ export default {
|
|||||||
font-weight: 700;
|
font-weight: 700;
|
||||||
font-size: 28rpx;
|
font-size: 28rpx;
|
||||||
color: #000000;
|
color: #000000;
|
||||||
|
|
||||||
text {
|
text {
|
||||||
padding-left: 16rpx;
|
padding-left: 16rpx;
|
||||||
font-family: Source Han Sans CN, Source Han Sans CN;
|
font-family: Source Han Sans CN, Source Han Sans CN;
|
||||||
@@ -364,6 +418,7 @@ export default {
|
|||||||
color: #b9b9c2;
|
color: #b9b9c2;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.signatureVersion {
|
.signatureVersion {
|
||||||
width: 690rpx;
|
width: 690rpx;
|
||||||
height: 280rpx;
|
height: 280rpx;
|
||||||
@@ -373,11 +428,10 @@ export default {
|
|||||||
}
|
}
|
||||||
|
|
||||||
.confirm-btn {
|
.confirm-btn {
|
||||||
position: fixed;
|
|
||||||
bottom: 45rpx;
|
|
||||||
left: 20rpx;
|
left: 20rpx;
|
||||||
right: 20rpx;
|
right: 20rpx;
|
||||||
height: 78rpx;
|
height: 78rpx;
|
||||||
|
margin-bottom: 40rpx;
|
||||||
background: #ffffff;
|
background: #ffffff;
|
||||||
border-radius: 20rpx;
|
border-radius: 20rpx;
|
||||||
display: flex;
|
display: flex;
|
||||||
@@ -512,5 +566,12 @@ export default {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
.signImg {
|
||||||
|
width: 280rpx;
|
||||||
|
height: 690rpx;
|
||||||
|
transform-origin: left top;
|
||||||
|
transform: rotate(-90deg) translateX(-280rpx);
|
||||||
|
}
|
||||||
|
}
|
||||||
</style>
|
</style>
|
||||||
+34
-18
@@ -31,7 +31,8 @@
|
|||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="section-content">
|
<view class="section-content">
|
||||||
<text class="title">{{ selectedYear }}年{{ selectedMonth < 10 ? '0' + selectedMonth : selectedMonth }}月工资条</text>
|
<text
|
||||||
|
class="title">{{ selectedYear }}年{{ selectedMonth < 10 ? '0' + selectedMonth : selectedMonth }}月工资条</text>
|
||||||
<view class="warning">
|
<view class="warning">
|
||||||
<text class="warning-icon">⚠</text>
|
<text class="warning-icon">⚠</text>
|
||||||
<text class="watext">工资表为系统自动生成,如有疑问请联系财务部门</text>
|
<text class="watext">工资表为系统自动生成,如有疑问请联系财务部门</text>
|
||||||
@@ -47,7 +48,8 @@
|
|||||||
|
|
||||||
<!-- 年份选择 -->
|
<!-- 年份选择 -->
|
||||||
<view class="year-grid" v-if="currentStep === 'year'">
|
<view class="year-grid" v-if="currentStep === 'year'">
|
||||||
<view v-for="year in availableYears" :key="year" class="year-item" :class="{ active: tempSelectedYear === year }" @click="selectYear(year)">
|
<view v-for="year in availableYears" :key="year" class="year-item"
|
||||||
|
:class="{ active: tempSelectedYear === year }" @click="selectYear(year)">
|
||||||
<view class="year-circle">
|
<view class="year-circle">
|
||||||
<text>{{ year }}年</text>
|
<text>{{ year }}年</text>
|
||||||
</view>
|
</view>
|
||||||
@@ -56,7 +58,8 @@
|
|||||||
|
|
||||||
<!-- 月份选择 -->
|
<!-- 月份选择 -->
|
||||||
<view class="month-grid" v-if="currentStep === 'month'">
|
<view class="month-grid" v-if="currentStep === 'month'">
|
||||||
<view v-for="month in months" :key="month" class="month-item" :class="{ active: tempSelectedMonth === month }" @click="selectMonth(month)">
|
<view v-for="month in months" :key="month" class="month-item"
|
||||||
|
:class="{ active: tempSelectedMonth === month }" @click="selectMonth(month)">
|
||||||
<view class="month-circle">
|
<view class="month-circle">
|
||||||
<text>{{ tempSelectedYear }}年{{ month < 10 ? '0' + month : month }}月</text>
|
<text>{{ tempSelectedYear }}年{{ month < 10 ? '0' + month : month }}月</text>
|
||||||
</view>
|
</view>
|
||||||
@@ -64,40 +67,44 @@
|
|||||||
</view>
|
</view>
|
||||||
|
|
||||||
<!-- 底部按钮 -->
|
<!-- 底部按钮 -->
|
||||||
<view class="modal-footer" v-if="currentStep === 'month'"><view class="back-btn" @click="backToYearSelect">返回年份选择</view></view>
|
<view class="modal-footer" v-if="currentStep === 'month'">
|
||||||
|
<view class="back-btn" @click="backToYearSelect">返回年份选择</view>
|
||||||
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
|
export default {
|
||||||
export default {
|
|
||||||
data() {
|
data() {
|
||||||
const currentDate = new Date();
|
const currentDate = new Date();
|
||||||
const currentYear = currentDate.getFullYear();
|
const currentYear = currentDate.getFullYear();
|
||||||
return {
|
return {
|
||||||
// 今年
|
// 今年
|
||||||
thisYear:'',
|
thisYear: '',
|
||||||
// 今月
|
// 今月
|
||||||
thisMonth:'',
|
thisMonth: '',
|
||||||
showModal: false,
|
showModal: false,
|
||||||
currentYear,
|
currentYear,
|
||||||
selectedYear: currentYear,
|
selectedYear: currentYear,
|
||||||
selectedMonth: currentDate.getMonth(),
|
selectedMonth: currentDate.getMonth(),
|
||||||
months: Array.from({ length: 12 }, (_, i) => i + 1),
|
months: Array.from({
|
||||||
|
length: 12
|
||||||
|
}, (_, i) => i + 1),
|
||||||
currentStep: 'year',
|
currentStep: 'year',
|
||||||
tempSelectedYear: currentYear,
|
tempSelectedYear: currentYear,
|
||||||
tempSelectedMonth: currentDate.getMonth(),
|
tempSelectedMonth: currentDate.getMonth(),
|
||||||
availableYears: Array.from({ length: 7 }, (_, i) => currentYear - 3 + i)
|
availableYears: Array.from({
|
||||||
|
length: 7
|
||||||
|
}, (_, i) => currentYear - 3 + i)
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
async created() {
|
async created() {
|
||||||
this.thisYear = this.selectedYear
|
this.thisYear = this.selectedYear
|
||||||
this.thisMonth = this.selectedMonth
|
this.thisMonth = this.selectedMonth
|
||||||
this.$setNavigationBar('人资系统');
|
this.$setNavigationBar('工资系统');
|
||||||
if (uni.getStorageSync('token')) {
|
if (uni.getStorageSync('token')) {} else {
|
||||||
} else {
|
|
||||||
let a = await this.$login();
|
let a = await this.$login();
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -135,20 +142,21 @@ export default {
|
|||||||
viewDetails() {
|
viewDetails() {
|
||||||
this.$navTo('/pages/attendanceManagement/attendanceManagement');
|
this.$navTo('/pages/attendanceManagement/attendanceManagement');
|
||||||
},
|
},
|
||||||
viewSalaryDetails(){
|
viewSalaryDetails() {
|
||||||
this.$navTo('/pages/salaryDetails/salaryDetails');
|
this.$navTo(`/pages/salaryDetails/salaryDetails?year=${this.selectedYear}&month=${this.selectedMonth}`);
|
||||||
},
|
},
|
||||||
|
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style lang="scss" scoped>
|
<style lang="scss" scoped>
|
||||||
.home-page {
|
.home-page {
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
min-height: 100vh;
|
min-height: 100vh;
|
||||||
background-color: #f8f9fa;
|
background-color: #f8f9fa;
|
||||||
padding: 0 30rpx;
|
padding: 0 30rpx;
|
||||||
|
|
||||||
.section {
|
.section {
|
||||||
background: #fff;
|
background: #fff;
|
||||||
border-radius: 20rpx;
|
border-radius: 20rpx;
|
||||||
@@ -170,6 +178,7 @@ export default {
|
|||||||
height: 48rpx;
|
height: 48rpx;
|
||||||
margin-right: 10rpx;
|
margin-right: 10rpx;
|
||||||
}
|
}
|
||||||
|
|
||||||
text {
|
text {
|
||||||
font-family: Source Han Sans CN, Source Han Sans CN;
|
font-family: Source Han Sans CN, Source Han Sans CN;
|
||||||
font-weight: 400;
|
font-weight: 400;
|
||||||
@@ -183,6 +192,7 @@ export default {
|
|||||||
align-items: center;
|
align-items: center;
|
||||||
color: #666;
|
color: #666;
|
||||||
font-size: 28rpx;
|
font-size: 28rpx;
|
||||||
|
|
||||||
.blue-text {
|
.blue-text {
|
||||||
font-family: Source Han Sans CN, Source Han Sans CN;
|
font-family: Source Han Sans CN, Source Han Sans CN;
|
||||||
font-weight: 400;
|
font-weight: 400;
|
||||||
@@ -200,22 +210,26 @@ export default {
|
|||||||
|
|
||||||
.section-content {
|
.section-content {
|
||||||
margin-top: 35rpx;
|
margin-top: 35rpx;
|
||||||
|
|
||||||
.title {
|
.title {
|
||||||
font-family: Source Han Sans CN, Source Han Sans CN;
|
font-family: Source Han Sans CN, Source Han Sans CN;
|
||||||
font-weight: 400;
|
font-weight: 400;
|
||||||
font-size: 30rpx;
|
font-size: 30rpx;
|
||||||
color: #4b5563;
|
color: #4b5563;
|
||||||
}
|
}
|
||||||
|
|
||||||
.combination {
|
.combination {
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
}
|
}
|
||||||
|
|
||||||
.detail {
|
.detail {
|
||||||
font-family: Source Han Sans CN, Source Han Sans CN;
|
font-family: Source Han Sans CN, Source Han Sans CN;
|
||||||
font-weight: 400;
|
font-weight: 400;
|
||||||
font-size: 28rpx;
|
font-size: 28rpx;
|
||||||
color: #4b5563;
|
color: #4b5563;
|
||||||
}
|
}
|
||||||
|
|
||||||
.icon {
|
.icon {
|
||||||
width: 40rpx;
|
width: 40rpx;
|
||||||
height: 40rpx;
|
height: 40rpx;
|
||||||
@@ -231,6 +245,7 @@ export default {
|
|||||||
.warning-icon {
|
.warning-icon {
|
||||||
margin-right: 10rpx;
|
margin-right: 10rpx;
|
||||||
}
|
}
|
||||||
|
|
||||||
.watext {
|
.watext {
|
||||||
font-family: Source Han Sans CN, Source Han Sans CN;
|
font-family: Source Han Sans CN, Source Han Sans CN;
|
||||||
font-weight: 400;
|
font-weight: 400;
|
||||||
@@ -311,6 +326,7 @@ export default {
|
|||||||
}
|
}
|
||||||
|
|
||||||
&.active {
|
&.active {
|
||||||
|
|
||||||
.year-circle,
|
.year-circle,
|
||||||
.month-circle {
|
.month-circle {
|
||||||
background: #eef2ff;
|
background: #eef2ff;
|
||||||
@@ -339,5 +355,5 @@ export default {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
@@ -2,8 +2,8 @@
|
|||||||
<view class="salary-details">
|
<view class="salary-details">
|
||||||
<!-- 顶部蓝色卡片 -->
|
<!-- 顶部蓝色卡片 -->
|
||||||
<view class="salary-card">
|
<view class="salary-card">
|
||||||
<text class="date">2025年04月实发工资</text>
|
<text class="date">{{dataInfo.year}}年{{dataInfo.month}}月实发工资</text>
|
||||||
<text class="amount">3000.00</text>
|
<text class="amount">{{dataInfo.actualSalary}}</text>
|
||||||
<text class="tips">感谢您为公司的付出,辛苦了</text>
|
<text class="tips">感谢您为公司的付出,辛苦了</text>
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
@@ -13,43 +13,43 @@
|
|||||||
<view class="salary-items">
|
<view class="salary-items">
|
||||||
<view class="item">
|
<view class="item">
|
||||||
<text class="label">基本工资</text>
|
<text class="label">基本工资</text>
|
||||||
<text class="value">2500</text>
|
<text class="value">{{dataInfo.baseSalary}}</text>
|
||||||
</view>
|
</view>
|
||||||
<view class="item">
|
<view class="item">
|
||||||
<text class="label">年度绩效奖金</text>
|
<text class="label">年度绩效奖金</text>
|
||||||
<text class="value">500</text>
|
<text class="value">{{dataInfo.annualPerformanceBonus}}</text>
|
||||||
</view>
|
</view>
|
||||||
<view class="item">
|
<view class="item">
|
||||||
<text class="label">月度绩效奖金</text>
|
<text class="label">月度绩效奖金</text>
|
||||||
<text class="value">500</text>
|
<text class="value">{{dataInfo.monthlyPerformanceBonus}}</text>
|
||||||
</view>
|
</view>
|
||||||
<view class="item">
|
<view class="item">
|
||||||
<text class="label">其他奖金</text>
|
<text class="label">其他奖金</text>
|
||||||
<text class="value">1000</text>
|
<text class="value">{{dataInfo.otherBonus}}</text>
|
||||||
</view>
|
</view>
|
||||||
<view class="item">
|
<view class="item">
|
||||||
<text class="label">总经理补贴</text>
|
<text class="label">总经理补贴</text>
|
||||||
<text class="value">0</text>
|
<text class="value">{{dataInfo.managerAllowance}}</text>
|
||||||
</view>
|
</view>
|
||||||
<view class="item">
|
<view class="item">
|
||||||
<text class="label">交通补贴</text>
|
<text class="label">交通补贴</text>
|
||||||
<text class="value">50</text>
|
<text class="value">{{dataInfo.transportationAllowance}}</text>
|
||||||
</view>
|
</view>
|
||||||
<view class="item">
|
<view class="item">
|
||||||
<text class="label">其他补贴</text>
|
<text class="label">其他补贴</text>
|
||||||
<text class="value">0</text>
|
<text class="value">{{dataInfo.otherAllowance}}</text>
|
||||||
</view>
|
</view>
|
||||||
<view class="item">
|
<view class="item">
|
||||||
<text class="label">工龄工资</text>
|
<text class="label">工龄工资</text>
|
||||||
<text class="value">50</text>
|
<text class="value">{{dataInfo.senioritySalary}}</text>
|
||||||
</view>
|
</view>
|
||||||
<view class="item">
|
<view class="item">
|
||||||
<text class="label">加班工资</text>
|
<text class="label">加班工资</text>
|
||||||
<text class="value">0</text>
|
<text class="value">{{dataInfo.overtimePay}}</text>
|
||||||
</view>
|
</view>
|
||||||
<view class="item total">
|
<view class="item total">
|
||||||
<text class="label">应发小计</text>
|
<text class="label">应发小计</text>
|
||||||
<text class="value highlight">5000</text>
|
<text class="value highlight">{{dataInfo.grossPaySummary}}</text>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
@@ -60,43 +60,44 @@
|
|||||||
<view class="salary-items">
|
<view class="salary-items">
|
||||||
<view class="item">
|
<view class="item">
|
||||||
<text class="label">年度绩效奖金</text>
|
<text class="label">年度绩效奖金</text>
|
||||||
<text class="value">2500</text>
|
<text class="value">{{dataInfo.annualPerformanceDeduction}}</text>
|
||||||
</view>
|
</view>
|
||||||
<view class="item">
|
<view class="item">
|
||||||
<text class="label">月度绩效奖金</text>
|
<text class="label">月度绩效奖金</text>
|
||||||
<text class="value">500</text>
|
<text class="value">{{dataInfo.monthlyPerformanceDeduction}}</text>
|
||||||
</view>
|
</view>
|
||||||
<view class="item">
|
<view class="item">
|
||||||
<text class="label">事假</text>
|
<text class="label">事假</text>
|
||||||
<text class="value">500</text>
|
<text class="value">{{dataInfo.personalLeaveDeduction}}</text>
|
||||||
</view>
|
</view>
|
||||||
<view class="item">
|
<view class="item">
|
||||||
<text class="label">病假</text>
|
<text class="label">病假</text>
|
||||||
<text class="value">1000</text>
|
<text class="value">{{dataInfo.sickLeaveDeduction}}</text>
|
||||||
</view>
|
</view>
|
||||||
<view class="item">
|
<view class="item">
|
||||||
<text class="label">婚假、丧假、陪产假</text>
|
<text class="label">婚假、丧假、陪产假</text>
|
||||||
<text class="value">0</text>
|
<text
|
||||||
|
class="value">{{dataInfo.marriageLeaveDeduction}}、{{dataInfo.bereavementLeaveDeduction}}、{{dataInfo.paternityLeaveDeduction}}</text>
|
||||||
</view>
|
</view>
|
||||||
<view class="item">
|
<view class="item">
|
||||||
<text class="label">迟到、早退</text>
|
<text class="label">迟到、早退</text>
|
||||||
<text class="value">50</text>
|
<text class="value">{{dataInfo.lateEarlyDeduction}}</text>
|
||||||
</view>
|
</view>
|
||||||
<view class="item">
|
<view class="item">
|
||||||
<text class="label">签到、签退</text>
|
<text class="label">签到、签退</text>
|
||||||
<text class="value">0</text>
|
<text class="value">{{dataInfo.missedCheckInOutDeduction}}</text>
|
||||||
</view>
|
</view>
|
||||||
<view class="item">
|
<view class="item">
|
||||||
<text class="label">缺卡</text>
|
<text class="label">缺卡</text>
|
||||||
<text class="value">50</text>
|
<text class="value">{{dataInfo.absentCardDeduction}}</text>
|
||||||
</view>
|
</view>
|
||||||
<view class="item">
|
<view class="item">
|
||||||
<text class="label">旷工</text>
|
<text class="label">旷工</text>
|
||||||
<text class="value">0</text>
|
<text class="value">{{dataInfo.absenteeismDeduction}}</text>
|
||||||
</view>
|
</view>
|
||||||
<view class="item">
|
<view class="item">
|
||||||
<text class="label">违纪</text>
|
<text class="label">违纪</text>
|
||||||
<text class="value">0</text>
|
<text class="value">{{dataInfo.violationDeduction}}</text>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
@@ -107,23 +108,23 @@
|
|||||||
<view class="salary-items">
|
<view class="salary-items">
|
||||||
<view class="item">
|
<view class="item">
|
||||||
<text class="label">基本养老</text>
|
<text class="label">基本养老</text>
|
||||||
<text class="value">2500</text>
|
<text class="value">{{dataInfo.basicPensionDeduction}}</text>
|
||||||
</view>
|
</view>
|
||||||
<view class="item">
|
<view class="item">
|
||||||
<text class="label">失业保险</text>
|
<text class="label">失业保险</text>
|
||||||
<text class="value">500</text>
|
<text class="value">{{dataInfo.unemploymentInsuranceDeduction}}</text>
|
||||||
</view>
|
</view>
|
||||||
<view class="item">
|
<view class="item">
|
||||||
<text class="label">基本医疗</text>
|
<text class="label">基本医疗</text>
|
||||||
<text class="value">500</text>
|
<text class="value">{{dataInfo.basicMedicalDeduction}}</text>
|
||||||
</view>
|
</view>
|
||||||
<view class="item">
|
<view class="item">
|
||||||
<text class="label">大额医疗</text>
|
<text class="label">大额医疗</text>
|
||||||
<text class="value">1000</text>
|
<text class="value">{{dataInfo.medicalDeductionAmount}}</text>
|
||||||
</view>
|
</view>
|
||||||
<view class="item">
|
<view class="item">
|
||||||
<text class="label">住房公积金</text>
|
<text class="label">住房公积金</text>
|
||||||
<text class="value">0</text>
|
<text class="value">{{dataInfo.housingFundDeduction}}</text>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
@@ -134,37 +135,122 @@
|
|||||||
<view class="salary-items">
|
<view class="salary-items">
|
||||||
<view class="item">
|
<view class="item">
|
||||||
<text class="label">其他扣款</text>
|
<text class="label">其他扣款</text>
|
||||||
<text class="value">2500</text>
|
<text class="value">{{dataInfo.otherDeduction}}</text>
|
||||||
</view>
|
</view>
|
||||||
<view class="item">
|
<view class="item">
|
||||||
<text class="label">个税</text>
|
<text class="label">个税</text>
|
||||||
<text class="value">500</text>
|
<text class="value">{{dataInfo.individualTaxDeduction}}</text>
|
||||||
</view>
|
</view>
|
||||||
<view class="item total">
|
<view class="item total">
|
||||||
<text class="label">扣款小计</text>
|
<text class="label">扣款小计</text>
|
||||||
<text class="value highlight red">2000</text>
|
<text class="value highlight red">{{dataInfo.deductionDetails}}</text>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
<!-- 备注 -->
|
<!-- 备注 -->
|
||||||
<view class="salary-section"><view>备注</view></view>
|
<view class="salary-section">
|
||||||
|
<view>备注</view>
|
||||||
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
export default {
|
import {
|
||||||
|
getPayrollSheets
|
||||||
|
} from "../../api/create"
|
||||||
|
export default {
|
||||||
data() {
|
data() {
|
||||||
return {};
|
return {
|
||||||
},
|
month: "",
|
||||||
created() {
|
year: "",
|
||||||
this.$setNavigationBar('工资条');
|
dataInfo: {
|
||||||
|
absentCardDeduction: "",
|
||||||
|
absenteeismDeduction: '',
|
||||||
|
actualSalary: '',
|
||||||
|
annualPerformanceBonus: '',
|
||||||
|
annualPerformanceDeduction: '',
|
||||||
|
baseSalary: '',
|
||||||
|
basicMedicalDeduction: '',
|
||||||
|
basicPensionDeduction: '',
|
||||||
|
bereavementLeaveDeduction: '',
|
||||||
|
flag: '',
|
||||||
|
grossPaySummary: '',
|
||||||
|
housingFundDeduction: '',
|
||||||
|
individualTaxDeduction: '',
|
||||||
|
lateEarlyDeduction: '',
|
||||||
|
localMinimumWages: '',
|
||||||
|
managerAllowance: '',
|
||||||
|
marriageLeaveDeduction: '',
|
||||||
|
maternityLeaveDeduction: '',
|
||||||
|
medicalDeductionAmount: '',
|
||||||
|
missedCheckInOutDeduction: '',
|
||||||
|
month: '',
|
||||||
|
monthlyPerformanceBonus: '',
|
||||||
|
monthlyPerformanceDeduction: '',
|
||||||
|
otherAllowance: '',
|
||||||
|
otherBonus: '',
|
||||||
|
otherDeduction: '',
|
||||||
|
overtimePay: '',
|
||||||
|
paternityLeaveDeduction: '',
|
||||||
|
personalLeaveDeduction: '',
|
||||||
|
senioritySalary: '',
|
||||||
|
severeLateEarlyDeduction: '',
|
||||||
|
sickLeaveDeduction: '',
|
||||||
|
transportationAllowance: '',
|
||||||
|
unemploymentInsuranceDeduction: '',
|
||||||
|
userid: '',
|
||||||
|
violationDeduction: '',
|
||||||
|
year: '',
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
},
|
||||||
|
computed: {
|
||||||
|
// deductionTotle() {
|
||||||
|
// return Number(this.dataInfo.absentCardDeduction) +
|
||||||
|
// Number(this.dataInfo.absenteeismDeduction) +
|
||||||
|
// Number(this.dataInfo.annualPerformanceDeduction) +
|
||||||
|
// Number(this.dataInfo.basicMedicalDeduction) +
|
||||||
|
// Number(this.dataInfo.basicPensionDeduction) +
|
||||||
|
// Number(this.dataInfo.bereavementLeaveDeduction) +
|
||||||
|
// Number(this.dataInfo.housingFundDeduction) +
|
||||||
|
// Number(this.dataInfo.individualTaxDeduction) +
|
||||||
|
// Number(this.dataInfo.lateEarlyDeduction) +
|
||||||
|
// Number(this.dataInfo.marriageLeaveDeduction) +
|
||||||
|
// Number(this.dataInfo.maternityLeaveDeduction) +
|
||||||
|
// Number(this.dataInfo.missedCheckInOutDeduction) +
|
||||||
|
// Number(this.dataInfo.monthlyPerformanceDeduction) +
|
||||||
|
// Number(this.dataInfo.paternityLeaveDeduction) +
|
||||||
|
// Number(this.dataInfo.personalLeaveDeduction) +
|
||||||
|
// Number(this.dataInfo.severeLateEarlyDeduction) +
|
||||||
|
// Number(this.dataInfo.sickLeaveDeduction) +
|
||||||
|
// Number(this.dataInfo.unemploymentInsuranceDeduction) +
|
||||||
|
// Number(this.dataInfo.violationDeduction)
|
||||||
|
// }
|
||||||
|
},
|
||||||
|
onLoad: function(option) {
|
||||||
|
const {
|
||||||
|
month,
|
||||||
|
year
|
||||||
|
} = option
|
||||||
|
this.month = option.month
|
||||||
|
this.year = option.year
|
||||||
|
this.$setNavigationBar('工资条');
|
||||||
|
this.getPayrollSheetsFun()
|
||||||
|
},
|
||||||
|
methods: {
|
||||||
|
async getPayrollSheetsFun() {
|
||||||
|
const res = await getPayrollSheets(this.year, this.month)
|
||||||
|
if (res.errcode == 0) {
|
||||||
|
this.dataInfo = res.result
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style lang="scss" scoped>
|
<style lang="scss" scoped>
|
||||||
.salary-details {
|
.salary-details {
|
||||||
min-height: 100vh;
|
min-height: 100vh;
|
||||||
background-color: #f8f9fa;
|
background-color: #f8f9fa;
|
||||||
padding-bottom: 40rpx;
|
padding-bottom: 40rpx;
|
||||||
@@ -182,6 +268,7 @@ export default {
|
|||||||
align-items: center;
|
align-items: center;
|
||||||
color: #ffffff;
|
color: #ffffff;
|
||||||
border-radius: 20rpx;
|
border-radius: 20rpx;
|
||||||
|
|
||||||
.date {
|
.date {
|
||||||
font-size: 32rpx;
|
font-size: 32rpx;
|
||||||
margin-bottom: 20rpx;
|
margin-bottom: 20rpx;
|
||||||
@@ -248,6 +335,7 @@ export default {
|
|||||||
font-weight: 700;
|
font-weight: 700;
|
||||||
font-size: 32rpx;
|
font-size: 32rpx;
|
||||||
color: #0078ff;
|
color: #0078ff;
|
||||||
|
|
||||||
&.red {
|
&.red {
|
||||||
color: #ff4d4f;
|
color: #ff4d4f;
|
||||||
}
|
}
|
||||||
@@ -256,5 +344,5 @@ export default {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
+53
-42
@@ -1,18 +1,9 @@
|
|||||||
<template>
|
<template>
|
||||||
<view class="sing-box">
|
<view class="sing-box">
|
||||||
<view class="canvas-box">
|
<view class="canvas-box">
|
||||||
<canvas
|
<canvas :width="width * scale" :height="height * scale" :style="{ width: width, height: height }"
|
||||||
:width="width * scale"
|
:disable-scroll="true" canvas-id="cansignature" id="cansignature" @touchstart="handleTouchStart"
|
||||||
:height="height * scale"
|
@touchMove="handleTouchMove" @touchCancel="handleTouchEnd" @touchEnd="handleTouchEnd"></canvas>
|
||||||
:style="{ width: width, height: height }"
|
|
||||||
:disable-scroll="true"
|
|
||||||
canvas-id="cansignature"
|
|
||||||
id="cansignature"
|
|
||||||
@touchstart="handleTouchStart"
|
|
||||||
@touchMove="handleTouchMove"
|
|
||||||
@touchCancel="handleTouchEnd"
|
|
||||||
@touchEnd="handleTouchEnd"
|
|
||||||
></canvas>
|
|
||||||
</view>
|
</view>
|
||||||
<view class="tips">请在空白区域内横向签字</view>
|
<view class="tips">请在空白区域内横向签字</view>
|
||||||
<view class="button-box">
|
<view class="button-box">
|
||||||
@@ -23,10 +14,12 @@
|
|||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
import Signature from 'mini-smooth-signature';
|
import Signature from 'mini-smooth-signature';
|
||||||
import baseUrl from '@/api/baseUrl.js';
|
import baseUrl from '@/api/baseUrl.js';
|
||||||
import { signatureOfMeetingMinutesApi } from '@/api/create.js';
|
import {
|
||||||
export default {
|
signatureOfMeetingMinutesApi,
|
||||||
|
} from '@/api/create.js';
|
||||||
|
export default {
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
signature: '',
|
signature: '',
|
||||||
@@ -34,10 +27,14 @@ export default {
|
|||||||
height: '',
|
height: '',
|
||||||
scale: 1,
|
scale: 1,
|
||||||
imgurl: '',
|
imgurl: '',
|
||||||
|
id: ''
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
onLoad(obj) {
|
onLoad(option) {
|
||||||
|
this.id = option.id
|
||||||
|
console.log(option.id);
|
||||||
|
},
|
||||||
|
onShow() {
|
||||||
this.$setNavigationBar('手写签名');
|
this.$setNavigationBar('手写签名');
|
||||||
this.initSignature();
|
this.initSignature();
|
||||||
dd.getSystemInfo({
|
dd.getSystemInfo({
|
||||||
@@ -57,33 +54,34 @@ export default {
|
|||||||
},
|
},
|
||||||
// 点击确认
|
// 点击确认
|
||||||
onClickAffirm() {
|
onClickAffirm() {
|
||||||
uni.showLoading({ title: '提交中', mask: true });
|
uni.showLoading({
|
||||||
this.signature.getImagePath().then(res => {
|
title: '提交中',
|
||||||
var pages = getCurrentPages();
|
mask: true
|
||||||
var previousPage = pages[pages.length - 2];
|
});
|
||||||
|
console.log(this.signature);
|
||||||
|
this.signature.toDataURL().then(res => {
|
||||||
|
console.log(res);
|
||||||
uni.uploadFile({
|
uni.uploadFile({
|
||||||
url: baseUrl + '/file/upload',
|
url: baseUrl + '/file',
|
||||||
fileName: 'file',
|
fileName: 'files',
|
||||||
header: {
|
header: {
|
||||||
Authorization: JSON.parse(uni.getStorageSync('token'))
|
Authorization: 'Bearer ' + uni.getStorageSync('token')
|
||||||
},
|
},
|
||||||
fileType: 'image', // 必填
|
fileType: 'image', // 必填
|
||||||
filePath: res,
|
filePath: res,
|
||||||
success: async res => {
|
success: async res => {
|
||||||
let data = JSON.parse(res.data);
|
let data = JSON.parse(res.data);
|
||||||
if (data.code == 200) {
|
if (data.errmsg == "ok") {
|
||||||
uni.hideLoading();
|
uni.hideLoading();
|
||||||
// 把值给前一个页面中的data
|
console.log(data.result[0], [this.id], '地址');
|
||||||
// previousPage.$vm.signatureAddress = data.data
|
|
||||||
console.log(data, '地址');
|
|
||||||
let obj = {
|
let obj = {
|
||||||
id: '',
|
ids: [this.id],
|
||||||
meetingMinutesSign: ''
|
signatureImg: data.result[0]
|
||||||
};
|
};
|
||||||
obj.id = this.meetingId;
|
obj.id = this.meetingId;
|
||||||
obj.meetingMinutesSign = data.data;
|
obj.meetingMinutesSign = data.data;
|
||||||
let signRes = await signatureOfMeetingMinutesApi(obj);
|
let signRes = await signatureOfMeetingMinutesApi(obj);
|
||||||
if (signRes.code == 200) {
|
if (signRes.errmsg == "ok") {
|
||||||
uni.showToast({
|
uni.showToast({
|
||||||
title: '签字成功',
|
title: '签字成功',
|
||||||
duration: 2000
|
duration: 2000
|
||||||
@@ -93,14 +91,22 @@ export default {
|
|||||||
title: '服务器错误,有结果!'
|
title: '服务器错误,有结果!'
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
setTimeout(() => {
|
||||||
uni.navigateBack();
|
uni.navigateBack();
|
||||||
|
}, 1000)
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
uni.showToast({ title: data.msg, icon: 'error' });
|
uni.showToast({
|
||||||
|
title: data.msg,
|
||||||
|
icon: 'error'
|
||||||
|
});
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
fail: err => {
|
fail: err => {
|
||||||
uni.showToast({ title: err, icon: 'error' });
|
uni.showToast({
|
||||||
|
title: err,
|
||||||
|
icon: 'error'
|
||||||
|
});
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
@@ -115,17 +121,16 @@ export default {
|
|||||||
scale: 1,
|
scale: 1,
|
||||||
color: '#000000',
|
color: '#000000',
|
||||||
bgColor: '#ffffff',
|
bgColor: '#ffffff',
|
||||||
getImagePath: () => {
|
toDataURL: function(res) {
|
||||||
return new Promise(resolve => {
|
return new Promise(resolve => {
|
||||||
ctx.toTempFilePath({
|
ctx.toTempFilePath({
|
||||||
success: res => resolve(res.filePath)
|
success: res => resolve(res.filePath)
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
},
|
|
||||||
toDataURL: function(res) {
|
|
||||||
return this;
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
},
|
},
|
||||||
// 绑定touchstart事件
|
// 绑定touchstart事件
|
||||||
handleTouchStart(e) {
|
handleTouchStart(e) {
|
||||||
@@ -142,11 +147,11 @@ export default {
|
|||||||
this.signature.onDrawEnd();
|
this.signature.onDrawEnd();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style lang="scss" scoped>
|
<style lang="scss" scoped>
|
||||||
.sing-box {
|
.sing-box {
|
||||||
width: 100vw;
|
width: 100vw;
|
||||||
height: 100vh;
|
height: 100vh;
|
||||||
// border-bottom: 2rpx dashed rgba(94,110,254,0.20);
|
// border-bottom: 2rpx dashed rgba(94,110,254,0.20);
|
||||||
@@ -154,6 +159,7 @@ export default {
|
|||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
display: flex;
|
display: flex;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
|
|
||||||
.tips {
|
.tips {
|
||||||
position: fixed;
|
position: fixed;
|
||||||
right: 0;
|
right: 0;
|
||||||
@@ -168,6 +174,7 @@ export default {
|
|||||||
line-height: 40rpx;
|
line-height: 40rpx;
|
||||||
transform: rotateZ(90deg) translateX(60%) translateY(-250%);
|
transform: rotateZ(90deg) translateX(60%) translateY(-250%);
|
||||||
}
|
}
|
||||||
|
|
||||||
.label {
|
.label {
|
||||||
width: 150rpx;
|
width: 150rpx;
|
||||||
color: #002567;
|
color: #002567;
|
||||||
@@ -175,12 +182,14 @@ export default {
|
|||||||
line-height: 70rpx;
|
line-height: 70rpx;
|
||||||
font-weight: 500;
|
font-weight: 500;
|
||||||
}
|
}
|
||||||
|
|
||||||
.canvas-box {
|
.canvas-box {
|
||||||
position: relative;
|
position: relative;
|
||||||
z-index: 0;
|
z-index: 0;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
}
|
}
|
||||||
|
|
||||||
.button-box {
|
.button-box {
|
||||||
position: fixed;
|
position: fixed;
|
||||||
left: 0;
|
left: 0;
|
||||||
@@ -188,6 +197,7 @@ export default {
|
|||||||
z-index: 10000;
|
z-index: 10000;
|
||||||
display: flex;
|
display: flex;
|
||||||
transform: rotate(90deg) translateX(-50%) translateY(80%);
|
transform: rotate(90deg) translateX(-50%) translateY(80%);
|
||||||
|
|
||||||
.clear-button {
|
.clear-button {
|
||||||
width: 142rpx;
|
width: 142rpx;
|
||||||
height: 80rpx;
|
height: 80rpx;
|
||||||
@@ -201,6 +211,7 @@ export default {
|
|||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
margin-right: 18rpx;
|
margin-right: 18rpx;
|
||||||
}
|
}
|
||||||
|
|
||||||
.affirm-button {
|
.affirm-button {
|
||||||
width: 142rpx;
|
width: 142rpx;
|
||||||
height: 80rpx;
|
height: 80rpx;
|
||||||
@@ -212,5 +223,5 @@ export default {
|
|||||||
font-size: 24rpx;
|
font-size: 24rpx;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
Reference in New Issue
Block a user