Merge branch 'zgs' into 'main'

Zgs

See merge request hzd/salaryAccounting!2

api/baseUrl.js

@@ -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

api/create.js

@@ -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({
 		method: "GET",
 		url: `/login?code=${authCode}`,
-		data: {
+		data: {},
-		},
 		Header1: {
 
 		}
 	})
 }
 // 获取用户信息
-export function getUser(authCode){
+export function getUser(authCode) {
 	return request({
 		method: "get",
 		url: "/user",
-		data: {
+		data: {},
-		},
 	})
 }
 // 获取绩效考勤统计
-export function getPerformanceAttendanceApi(year,month){
+export function getPerformanceAttendanceApi(year, month) {
 	return request({
 		method: "get",
 		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 格式
+		}
+	})
+}

api/index.js

@@ -1,68 +1,95 @@
-
+import allUrl from "./baseUrl.js"
-import allUrl  from "./baseUrl.js"
 // 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"
 	data = data || {}
 	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]
 		}
 	}
 	data = newData || {}
-	header1 =  header1 || {
+	header1 = header1 || {
 		Authorization: 'Bearer ' + uni.getStorageSync('token')
 	}
-	return new Promise((reslove,reject)=>{
+	return new Promise((reslove, reject) => {
 		uni.request({
 			url: allUrl + url,
 			method,
 			header: header1,
 			data,
 			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('token');
-					setTimeout(()=>{
+					setTimeout(() => {
-						uni.reLaunch({ url: '/pages/newHomePage/newHomePage' });
+						uni.reLaunch({
+							url: '/pages/homePage/homePage'
+						});
 					}, 1000);
-				}else if(res.data.errcode != 0){
+				} else if (res.data.errcode != 0) {
 					console.log('不正确走的')
 					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)
 				}
 
 			},
 			fail: (err) => {
-				console.log('请求失败',err)
+				console.log('请求失败', err)
 				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('token');
-					setTimeout(()=>{
+					setTimeout(() => {
-						uni.reLaunch({ url: '/pages/newHomePage/newHomePage' });
+						uni.reLaunch({
+							url: '/pages/homePage/homePage'
+						});
 					}, 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('token');
-					setTimeout(()=>{
+
-						uni.reLaunch({ url: '/pages/newHomePage/newHomePage' });
+					setTimeout(() => {
+						uni.reLaunch({
+							url: '/pages/homePage/homePage'
+						});
 					}, 1000);
-				}else{
+				} else {
-					uni.showToast({ title: err.data.errmsg, icon: 'none' });
+					uni.showToast({
+						title: err.data.errmsg,
+						icon: 'none'
+					});
 				}
 				reject()
 			},
 			complete: () => {
-				setTimeout(()=>{
+				setTimeout(() => {
 					uni.hideLoading()
 				}, 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"
 	data = data || {}
 	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]
 		}
 	}
 	data = newData || {}
-	return new Promise((reslove,reject)=>{
+	return new Promise((reslove, reject) => {
 		uni.request({
 			url: allUrl + url,
 			method,
 			data,
+			header,
 			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('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)
-					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)
 				}
 

index.html

@@ -1,20 +1,20 @@
 <!DOCTYPE html>
 <html lang="en">
-  <head>
+	<head>
-    <meta charset="UTF-8" />
+		<meta charset="UTF-8" />
-    <script>
+		<script>
-      var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') ||
+			var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') ||
-        CSS.supports('top: constant(a)'))
+				CSS.supports('top: constant(a)'))
-      document.write(
+			document.write(
-        '<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' +
+				'<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' +
-        (coverSupport ? ', viewport-fit=cover' : '') + '" />')
+				(coverSupport ? ', viewport-fit=cover' : '') + '" />')
-    </script>
+		</script>
-    <title></title>
+		<title></title>
-    <!--preload-links-->
+		<!--preload-links-->
-    <!--app-context-->
+		<!--app-context-->
-  </head>
+	</head>
-  <body>
+	<body>
-    <div id="app"><!--app-html--></div>
+		<div id="app"><!--app-html--></div>
-    <script type="module" src="/main.js"></script>
+		<script type="module" src="/main.js"></script>
-  </body>
+	</body>
 </html>

main.js

@@ -2,14 +2,19 @@ import App from './App'
 import Inputli from './components/form/input-li.vue';
 import Selectli from './components/form/select-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
 import Vue from 'vue'
 Vue.config.productionTip = false
 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) {
 		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({
-	  title,
+		title,
-	  backgroundColor
+		backgroundColor
 	});
 }
-const navTo = (url, skip = 'navigateTo') =>{
+const navTo = (url, skip = 'navigateTo') => {
 	uni[skip]({
 		url
 	});
@@ -46,7 +51,7 @@ const login = () => {
 						uni.setStorageSync('token', res.result.token)
 						getUser().then(data => {
 							console.log(data)
-							uni.setStorageSync('user',data)
+							uni.setStorageSync('user', data)
 							uni.hideLoading()
 							// uni.showToast({
 							// 	title: '登录成功',
@@ -67,22 +72,22 @@ const login = () => {
 
 }
 // 提示框 点击确定进入resolve 取消进入reject
-const showModel = (content) =>{
+const showModel = (content) => {
-	return new Promise((resolve, reject)=>{
+	return new Promise((resolve, reject) => {
 		uni.showModal({
-		    title: '提示',
+			title: '提示',
-		    content: content,
+			content: content,
 			cancelText: '取消',
 			confirmText: '确定',
-		    success: function (res) {
+			success: function(res) {
-		        if (res.confirm) {
+				if (res.confirm) {
-		            console.log('用户点击确定');
+					console.log('用户点击确定');
 					resolve('affirm')
-		        } else if (res.cancel) {
+				} else if (res.cancel) {
-		            console.log('用户点击取消');
+					console.log('用户点击取消');
 					reject('cancal')
-		        }
+				}
-		    }
+			}
 		});
 	})
 }
@@ -97,13 +102,13 @@ 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'
 const app = new Vue({
-    ...App
+	...App
 })
 app.$mount()
 // #endif
@@ -112,11 +117,13 @@ app.$mount()
 
 
 // #ifdef VUE3
-import { createSSRApp } from 'vue'
+import {
+	createSSRApp
+} from 'vue'
 export function createApp() {
-  const app = createSSRApp(App)
+	const app = createSSRApp(App)
-  return {
+	return {
-    app
+		app
-  }
+	}
 }
 // #endif

manifest.json

@@ -1,73 +1,73 @@
 {
-	"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\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
-					"<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
-					"<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
-					"<uses-permission android:name=\"android.permission.CAMERA\"/>",
+                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
-					"<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-					"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
-					"<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera\"/>",
-					"<uses-feature android:name=\"android.hardware.camera\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
-					"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+                ]
-				]
+            },
-			},
+            /* 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"
 }

package-lock.json

@@ -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=="
+    }
+  }
+}

pages/attendanceManagement/attendanceManagement.vue

@@ -3,125 +3,139 @@
 		<!-- 月份选择 -->
 		<view class="month-selector" @click="showDatePicker">
 			<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>
 			</view>
 			<text class="month-text">月度</text>
 		</view>
-
+		<!-- 内容 -->
-		<!-- 打卡统计 -->
+		<view class="box" v-for="(attendanceData,index) in attendanceDataList" :key="index">
-		<view class="stat-section">
+			<view class="title">{{attendanceData.status=="1"?"试用":"正式"}}</view>
-			<view class="section-title">打卡统计</view>
+			<!-- 打卡统计 -->
-			<view class="stat-grid">
+			<view class="stat-section">
-				<view class="stat-item">
+				<view class="section-title">打卡统计</view>
-					<text class="label">迟到</text>
+				<view class="stat-grid">
-					<text class="value red-text">{{ attendanceData.late }}次</text>
+					<view class="stat-item">
-				</view>
+						<text class="label">迟到</text>
-				<view class="stat-item">
+						<text class="value red-text">{{ attendanceData.late }}次</text>
-					<text class="label">严重迟到</text>
+					</view>
-					<text class="value red-text">{{ attendanceData.seriousLate }}次</text>
+					<view class="stat-item">
-				</view>
+						<text class="label">严重迟到</text>
-				<view class="stat-item">
+						<text class="value red-text">{{ attendanceData.seriousLate }}次</text>
-					<text class="label">旷工</text>
+					</view>
-					<text class="value">{{ attendanceData.absenteeism }}次</text>
+					<view class="stat-item">
-				</view>
+						<text class="label">旷工</text>
-				<view class="stat-item">
+						<text class="value">{{ attendanceData.absenteeism }}次</text>
-					<text class="label">早退</text>
+					</view>
-					<text class="value red-text">{{ attendanceData.early }}次</text>
+					<view class="stat-item">
-				</view>
+						<text class="label">早退</text>
-				<view class="stat-item">
+						<text class="value red-text">{{ attendanceData.early }}次</text>
-					<text class="label">未打卡</text>
+					</view>
-					<text class="value red-text">{{ attendanceData.absenceCount }}次</text>
+					<view class="stat-item">
-				</view>
+						<text class="label">未打卡</text>
-				<view class="stat-item">
+						<text class="value red-text">{{ attendanceData.absenceCount }}次</text>
-					<text class="label">未签到签退</text>
+					</view>
-					<text class="value red-text">{{ attendanceData.missedCount }}次</text>
+					<view class="stat-item">
-				</view>
+						<text class="label">未签到签退</text>
-				<view class="stat-item">
+						<text class="value red-text">{{ attendanceData.missedCount }}次</text>
-					<text class="label">未提交日志</text>
+					</view>
-					<text class="value red-text">{{ attendanceData.missingLogCount }}次</text>
+					<view class="stat-item">
+						<text class="label">未提交日志</text>
+						<text class="value red-text">{{ attendanceData.missingLogCount }}次</text>
+					</view>
 				</view>
 			</view>
-		</view>
 
-		<!-- 请假统计 -->
+			<!-- 请假统计 -->
-		<view class="stat-section">
+			<view class="stat-section">
-			<view class="section-title">请假统计</view>
+				<view class="section-title">请假统计</view>
-			<view class="stat-grid">
+				<view class="stat-grid">
-				<view class="stat-item">
+					<view class="stat-item">
-					<text class="label">事假</text>
+						<text class="label">事假</text>
-					<text class="value red-text">{{ attendanceData.personalLeave }}小时</text>
+						<text class="value red-text">{{ attendanceData.personalLeave }}小时</text>
-				</view>
+					</view>
-				<view class="stat-item">
+					<view class="stat-item">
-					<text class="label">病假</text>
+						<text class="label">病假</text>
-					<text class="value red-text">{{ attendanceData.sickLeave }}天</text>
+						<text class="value red-text">{{ attendanceData.sickLeave }}天</text>
-				</view>
+					</view>
-				<view class="stat-item">
+					<view class="stat-item">
-					<text class="label">婚假</text>
+						<text class="label">婚假</text>
-					<text class="value">{{ attendanceData.marriageLeave }}天</text>
+						<text class="value">{{ attendanceData.marriageLeave }}天</text>
-				</view>
+					</view>
-				<view class="stat-item">
+					<view class="stat-item">
-					<text class="label">产假</text>
+						<text class="label">产假</text>
-					<text class="value red-text">{{ attendanceData.maternityLeave }}天</text>
+						<text class="value red-text">{{ attendanceData.maternityLeave }}天</text>
-				</view>
+					</view>
-				<view class="stat-item">
+					<view class="stat-item">
-					<text class="label">陪产假</text>
+						<text class="label">陪产假</text>
-					<text class="value red-text">{{ attendanceData.paternityLeave }}天</text>
+						<text class="value red-text">{{ attendanceData.paternityLeave }}天</text>
-				</view>
+					</view>
-				<view class="stat-item">
+					<view class="stat-item">
-					<text class="label">丧假</text>
+						<text class="label">丧假</text>
-					<text class="value red-text">{{ attendanceData.bereavementLeave }}天</text>
+						<text class="value red-text">{{ attendanceData.bereavementLeave }}天</text>
-				</view>
+					</view>
-				<view class="stat-item">
+					<view class="stat-item">
-					<text class="label">年休假</text>
+						<text class="label">年休假</text>
-					<text class="value red-text">{{ attendanceData.annualLeave }}天</text>
+						<text class="value red-text">{{ attendanceData.annualLeave }}天</text>
-				</view>
+					</view>
-				<view class="stat-item">
+					<view class="stat-item">
-					<text class="label">年休假(管理岗)</text>
+						<text class="label">年休假(管理岗)</text>
-					<text class="value red-text">{{ attendanceData.managementAnnualLeave }}天</text>
+						<text class="value red-text">{{ attendanceData.managementAnnualLeave }}天</text>
+					</view>
 				</view>
 			</view>
-		</view>
 
-		<!-- 加班、调休统计 -->
+			<!-- 加班、调休统计 -->
-		<view class="stat-section">
+			<view class="stat-section">
-			<view class="section-title">加班、调休统计</view>
+				<view class="section-title">加班、调休统计</view>
-			<view class="stat-grid">
+				<view class="stat-grid">
-				<view class="stat-item">
+					<view class="stat-item">
-					<text class="label">节假日加班</text>
+						<text class="label">节假日加班</text>
-					<text class="value red-text">{{ attendanceData.holidayOvertime }}小时</text>
+						<text class="value red-text">{{ attendanceData.holidayOvertime }}小时</text>
+					</view>
+					<view class="stat-item">
+						<text class="label">休息日加班</text>
+						<text class="value red-text">{{ attendanceData.restdayOvertime }}小时</text>
+					</view>
+					<view class="stat-item">
+						<text class="label">工作日加班</text>
+						<text class="value">{{ attendanceData.workdayOvertime }}小时</text>
+					</view>
+					<!--  <view class="stat-item">
+			  <text class="label">调休</text>
+			  <text class="value red-text">1小时</text>
+			</view> -->
 				</view>
-				<view class="stat-item">
-					<text class="label">休息日加班</text>
-					<text class="value red-text">{{ attendanceData.restdayOvertime }}小时</text>
-				</view>
-				<view class="stat-item">
-					<text class="label">工作日加班</text>
-					<text class="value">{{ attendanceData.workdayOvertime }}小时</text>
-				</view>
-				<!--  <view class="stat-item">
-          <text class="label">调休</text>
-          <text class="value red-text">1小时</text>
-        </view> -->
-			</view>
-		</view>
-
-		<!-- 底部说明 -->
-		<view class="bottom-tips">说明：请核实当月考勤记录，确认无误请签字确认</view>
-
-		<!-- 员工签字 -->
-
-		<view class="sign">
-			<view class="sign-tit">
-				员工签字
-				<text>/保留员工签字</text>
 			</view>
 
-			<view class="signatureVersion"></view>
+			<!-- 底部说明 -->
+			<view class="bottom-tips">说明：请核实当月考勤记录，确认无误请签字确认</view>
+			<!-- 员工签字 -->
+
+			<view class="sign" v-if="attendanceData.signatureImg">
+				<view class="sign-tit">
+					员工签字
+					<text>/保留员工签字</text>
+				</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 class="confirm-btn" @click="goSignIt"><text>签字确认</text></view>
+
+
 
 		<!-- 日期选择模态框 -->
 		<view class="date-picker-modal" v-if="showModal" @click.stop="closeDatePicker">
@@ -130,7 +144,8 @@
 
 				<!-- 年份选择 -->
 				<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">
 							<text>{{ year }}年</text>
 						</view>
@@ -139,7 +154,8 @@
 
 				<!-- 月份选择 -->
 				<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">
 							<text>{{ tempSelectedYear }}年{{ month < 10 ? '0' + month : month }}月</text>
 						</view>
@@ -147,370 +163,415 @@
 				</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>
 </template>
 
 <script>
-import { getPerformanceAttendanceApi } from '@/api/create.js';
+	import {
-export default {
+		getPerformanceAttendanceApi
-	data() {
+	} from '@/api/create.js';
-		const currentDate = new Date();
+	export default {
-		const currentYear = currentDate.getFullYear();
+		data() {
-		return {
+			const currentDate = new Date();
-			showModal: false,
+			const currentYear = currentDate.getFullYear();
-			currentYear,
+			return {
-			selectedYear: currentYear,
+				showModal: false,
-			selectedMonth: currentDate.getMonth(),
+				currentYear,
-			months: Array.from({ length: 12 }, (_, i) => i + 1),
+				selectedYear: currentYear,
-			currentStep: 'year', // 'year' 或 'month'
+				selectedMonth: currentDate.getMonth(),
-			tempSelectedYear: currentYear,
+				months: Array.from({
-			tempSelectedMonth: currentDate.getMonth() + 1,
+					length: 12
-			availableYears: Array.from({ length: 7 }, (_, i) => currentYear - 3 + i),
+				}, (_, i) => i + 1),
-			attendanceData: {
+				currentStep: 'year', // 'year' 或 'month'
-				// 迟到
+				tempSelectedYear: currentYear,
-				late: ' ',
+				tempSelectedMonth: currentDate.getMonth() + 1,
-				// 严重迟到
+				availableYears: Array.from({
-				seriousLate: ' ',
+					length: 7
-				// 旷工
+				}, (_, i) => currentYear - 3 + i),
-				absenteeism: ' ',
+				attendanceDataList: [{
-				// 早退
+					// 迟到
-				early: ' ',
+					late: ' ',
-				// 未打卡
+					// 严重迟到
-				absenceCount: ' ',
+					seriousLate: ' ',
-				// 未签到签退
+					// 旷工
-				missedCount: ' ',
+					absenteeism: ' ',
-				// 未提交日志
+					// 早退
-				missingLogCount: ' ',
+					early: ' ',
+					// 未打卡
+					absenceCount: ' ',
+					// 未签到签退
+					missedCount: ' ',
+					// 未提交日志
+					missingLogCount: ' ',
 
-				// 事假
+					// 事假
-				personalLeave: ' ',
+					personalLeave: ' ',
-				// 病假
+					// 病假
-				sickLeave: ' ',
+					sickLeave: ' ',
 
-				// 婚假
+					// 婚假
-				marriageLeave: ' ',
+					marriageLeave: ' ',
 
-				// 产假
+					// 产假
-				maternityLeave: ' ',
+					maternityLeave: ' ',
-				// 陪产假
+					// 陪产假
-				paternityLeave: ' ',
+					paternityLeave: ' ',
-				// 丧假
+					// 丧假
-				bereavementLeave: ' ',
+					bereavementLeave: ' ',
-				// 年休假
+					// 年休假
-				annualLeave: ' ',
+					annualLeave: ' ',
-				// 年休假（管理岗）
+					// 年休假（管理岗）
-				managementAnnualLeave: ' ',
+					managementAnnualLeave: ' ',
-				// 节假日加班
+					// 节假日加班
-				holidayOvertime: ' ',
+					holidayOvertime: ' ',
-				// 休息日加班
+					// 休息日加班
-				restdayOvertime: ' ',
+					restdayOvertime: ' ',
-				// 工作日加班
+					// 工作日加班
-				workdayOvertime: ' '
+					workdayOvertime: ' '
+				}]
+			};
+		},
+
+		onShow() {
+			this.getPerformanceAttendance();
+			this.$setNavigationBar('考勤管理');
+		},
+		methods: {
+			showDatePicker() {
+				this.showModal = true;
+				this.currentStep = 'year';
+				this.tempSelectedYear = this.selectedYear;
+				this.tempSelectedMonth = this.selectedMonth;
+			},
+			closeDatePicker() {
+				this.showModal = false;
+				this.currentStep = 'year';
+			},
+			selectYear(year) {
+				this.tempSelectedYear = year;
+				this.currentStep = 'month';
+			},
+			selectMonth(month) {
+				this.tempSelectedMonth = month;
+				this.selectedYear = this.tempSelectedYear;
+				this.selectedMonth = month;
+				this.showModal = false;
+				this.currentStep = 'year';
+				this.$emit('dateSelected', {
+					year: this.selectedYear,
+					month: this.selectedMonth
+				});
+				this.getPerformanceAttendance()
+			},
+			backToYearSelect() {
+				this.currentStep = 'year';
+			},
+			goSignIt(attendanceData) {
+				this.$navTo('/pages/sign/sign?id=' + attendanceData.id);
+			},
+			async getPerformanceAttendance() {
+				uni.showLoading({
+					mask: true,
+					title: '查询中...'
+				})
+
+				let res = await getPerformanceAttendanceApi(this.selectedYear, this.selectedMonth);
+				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
+								});
+							}
+						}
+					});
+				}
 			}
-		};
-	},
-	created() {
-		this.getPerformanceAttendance();
-		this.$setNavigationBar('考勤管理');
-	},
-	methods: {
-		showDatePicker() {
-			this.showModal = true;
-			this.currentStep = 'year';
-			this.tempSelectedYear = this.selectedYear;
-			this.tempSelectedMonth = this.selectedMonth;
-		},
-		closeDatePicker() {
-			this.showModal = false;
-			this.currentStep = 'year';
-		},
-		selectYear(year) {
-			this.tempSelectedYear = year;
-			this.currentStep = 'month';
-		},
-		selectMonth(month) {
-			this.tempSelectedMonth = month;
-			this.selectedYear = this.tempSelectedYear;
-			this.selectedMonth = month;
-			this.showModal = false;
-			this.currentStep = 'year';
-			this.$emit('dateSelected', {
-				year: this.selectedYear,
-				month: this.selectedMonth
-			});
-			this.getPerformanceAttendance()
-		},
-		backToYearSelect() {
-			this.currentStep = 'year';
-		},
-		goSignIt() {
-			this.$navTo('/pages/sign/sign');
-		},
-		async getPerformanceAttendance() {
-			uni.showLoading({
-				mask: true,
-				title: '查询中...'
-			})
-			
-			let res = await getPerformanceAttendanceApi(this.selectedYear, this.selectedMonth);
-			this.attendanceData = res.result;
-			uni.hideLoading();	
 		}
-	}
+	};
-};
 </script>
 
 <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;
 
-	.month-selector {
+		.month-selector {
-		padding: 0 28rpx 0 10rpx;
+			padding: 0 28rpx 0 10rpx;
-		display: flex;
-		align-items: center;
-		margin: 40rpx 0;
-		justify-content: space-between;
-		.combination {
-			height: 40rpx;
-			line-height: 40rpx;
 			display: flex;
-			align-content: center;
+			align-items: center;
-			.current-month {
+			margin: 40rpx 0;
+			justify-content: space-between;
+
+			.combination {
+				height: 40rpx;
+				line-height: 40rpx;
+				display: flex;
+				align-content: center;
+
+				.current-month {
+					font-family: Source Han Sans CN, Source Han Sans CN;
+					font-weight: 400;
+					font-size: 28rpx;
+					color: #4b5563;
+				}
+
+				.arrow {
+					transform: rotate(90deg);
+					width: 40rpx;
+					height: 40rpx;
+				}
+			}
+
+			.month-text {
 				font-family: Source Han Sans CN, Source Han Sans CN;
 				font-weight: 400;
 				font-size: 28rpx;
-				color: #4b5563;
+				color: #2b5ce4;
-			}
-
-			.arrow {
-				transform: rotate(90deg);
-				width: 40rpx;
-				height: 40rpx;
 			}
 		}
 
-		.month-text {
+		.box {
-			font-family: Source Han Sans CN, Source Han Sans CN;
+			.title {
-			font-weight: 400;
+				padding-bottom: 28rpx;
-			font-size: 28rpx;
-			color: #2b5ce4;
-		}
-	}
-
-	.stat-section {
-		background: #fff;
-		border-radius: 12rpx;
-		padding: 35rpx 40rpx;
-		margin-bottom: 20rpx;
-		.section-title {
-			font-size: 32rpx;
-			color: #111827;
-		}
-
-		.stat-grid {
-			margin-top: 40rpx;
-			display: grid;
-			grid-template-columns: repeat(3, 1fr);
-			gap: 40rpx 90rpx;
-
-			.stat-item {
-				display: flex;
-				flex-direction: column;
-				align-items: center;
-
-				.label {
-					font-size: 28rpx;
-					color: #4b5563;
-					margin-bottom: 15rpx;
-				}
-
-				.value {
-					font-size: 32rpx;
-					color: #666;
-					&.red-text {
-						color: #ff4d4f;
-					}
-				}
 			}
 		}
-	}
 
-	.bottom-tips {
+		.stat-section {
-		font-family: Source Han Sans CN, Source Han Sans CN;
+			background: #fff;
-		font-weight: 400;
+			border-radius: 12rpx;
-		font-size: 24rpx;
+			padding: 35rpx 40rpx;
-		color: #b9b9c2;
+			margin-bottom: 20rpx;
-	}
-	.sign {
-		margin-top: 32rpx;
-		margin-bottom: 180rpx;
-		.sign-tit {
-			margin-bottom: 32rpx;
-			margin-left: 8rpx;
-			font-family: Source Han Sans CN, Source Han Sans CN;
-			font-weight: 700;
-			font-size: 28rpx;
-			color: #000000;
-			text {
-				padding-left: 16rpx;
-				font-family: Source Han Sans CN, Source Han Sans CN;
-				font-weight: 400;
-				font-size: 24rpx;
-				color: #b9b9c2;
-			}
-		}
-		.signatureVersion {
-			width: 690rpx;
-			height: 280rpx;
-			background: #ffffff;
-			border-radius: 20rpx;
-		}
-	}
 
-	.confirm-btn {
+			.section-title {
-		position: fixed;
-		bottom: 45rpx;
-		left: 20rpx;
-		right: 20rpx;
-		height: 78rpx;
-		background: #ffffff;
-		border-radius: 20rpx;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		font-family: Source Han Sans CN, Source Han Sans CN;
-		font-weight: 400;
-		font-size: 30rpx;
-		color: #0078ff;
-		font-size: 32rpx;
-		border: 2rpx solid #0078ff;
-	}
-
-	.date-picker-modal {
-		position: fixed;
-		top: 0;
-		left: 0;
-		right: 0;
-		bottom: 0;
-		background: rgba(0, 0, 0, 0.5);
-		z-index: 999;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-
-		.modal-content {
-			width: 690rpx;
-			background: #ffffff;
-			border-radius: 20rpx;
-			padding: 40rpx 30rpx;
-
-			.modal-title {
 				font-size: 32rpx;
 				color: #111827;
-				text-align: center;
-				margin-bottom: 40rpx;
-				font-weight: 500;
 			}
 
-			.year-grid {
+			.stat-grid {
+				margin-top: 40rpx;
 				display: grid;
-				grid-template-columns: repeat(2, 1fr);
+				grid-template-columns: repeat(3, 1fr);
-				gap: 20rpx;
+				gap: 40rpx 90rpx;
-				padding: 0 20rpx;
 
-				.year-item {
+				.stat-item {
-					height: 88rpx;
 					display: flex;
+					flex-direction: column;
 					align-items: center;
-					justify-content: center;
 
-					.year-circle {
+					.label {
-						width: 100%;
+						font-size: 28rpx;
-						height: 100%;
+						color: #4b5563;
-						display: flex;
+						margin-bottom: 15rpx;
-						align-items: center;
-						justify-content: center;
-						border-radius: 8rpx;
-						border: 2rpx solid #e5e7eb;
-
-						text {
-							font-size: 28rpx;
-							color: #4b5563;
-						}
 					}
 
-					&.active {
+					.value {
-						.year-circle {
+						font-size: 32rpx;
-							background: #eef2ff;
+						color: #666;
-							border-color: #2b5ce4;
 
-							text {
+						&.red-text {
-								color: #2b5ce4;
+							color: #ff4d4f;
-							}
 						}
 					}
 				}
 			}
+		}
 
-			.month-grid {
+		.bottom-tips {
-				display: grid;
+			font-family: Source Han Sans CN, Source Han Sans CN;
-				grid-template-columns: repeat(2, 1fr);
+			font-weight: 400;
-				gap: 20rpx;
+			font-size: 24rpx;
-				padding: 0 20rpx;
+			color: #b9b9c2;
+		}
 
-				.month-item {
+		.sign {
-					height: 88rpx;
+			margin-top: 32rpx;
-					display: flex;
+			margin-bottom: 32rpx;
-					align-items: center;
+
-					justify-content: center;
+			.sign-tit {
+				margin-bottom: 32rpx;
+				margin-left: 8rpx;
+				font-family: Source Han Sans CN, Source Han Sans CN;
+				font-weight: 700;
+				font-size: 28rpx;
+				color: #000000;
+
+				text {
+					padding-left: 16rpx;
+					font-family: Source Han Sans CN, Source Han Sans CN;
+					font-weight: 400;
+					font-size: 24rpx;
+					color: #b9b9c2;
+				}
+			}
+
+			.signatureVersion {
+				width: 690rpx;
+				height: 280rpx;
+				background: #ffffff;
+				border-radius: 20rpx;
+			}
+		}
+
+		.confirm-btn {
+			left: 20rpx;
+			right: 20rpx;
+			height: 78rpx;
+			margin-bottom: 40rpx;
+			background: #ffffff;
+			border-radius: 20rpx;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			font-family: Source Han Sans CN, Source Han Sans CN;
+			font-weight: 400;
+			font-size: 30rpx;
+			color: #0078ff;
+			font-size: 32rpx;
+			border: 2rpx solid #0078ff;
+		}
+
+		.date-picker-modal {
+			position: fixed;
+			top: 0;
+			left: 0;
+			right: 0;
+			bottom: 0;
+			background: rgba(0, 0, 0, 0.5);
+			z-index: 999;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+
+			.modal-content {
+				width: 690rpx;
+				background: #ffffff;
+				border-radius: 20rpx;
+				padding: 40rpx 30rpx;
+
+				.modal-title {
+					font-size: 32rpx;
+					color: #111827;
+					text-align: center;
+					margin-bottom: 40rpx;
+					font-weight: 500;
+				}
+
+				.year-grid {
+					display: grid;
+					grid-template-columns: repeat(2, 1fr);
+					gap: 20rpx;
+					padding: 0 20rpx;
 
-					.month-circle {
+					.year-item {
-						width: 100%;
+						height: 88rpx;
-						height: 100%;
 						display: flex;
 						align-items: center;
 						justify-content: center;
-						border-radius: 8rpx;
+
-						border: 2rpx solid #e5e7eb;
+						.year-circle {
+							width: 100%;
+							height: 100%;
+							display: flex;
+							align-items: center;
+							justify-content: center;
+							border-radius: 8rpx;
+							border: 2rpx solid #e5e7eb;
+
+							text {
+								font-size: 28rpx;
+								color: #4b5563;
+							}
+						}
+
+						&.active {
+							.year-circle {
+								background: #eef2ff;
+								border-color: #2b5ce4;
 
-						text {
+								text {
-							font-size: 28rpx;
+									color: #2b5ce4;
-							color: #4b5563;
+								}
+							}
 						}
 					}
+				}
+
+				.month-grid {
+					display: grid;
+					grid-template-columns: repeat(2, 1fr);
+					gap: 20rpx;
+					padding: 0 20rpx;
+
+					.month-item {
+						height: 88rpx;
+						display: flex;
+						align-items: center;
+						justify-content: center;
 
-					&.active {
 						.month-circle {
-							background: #eef2ff;
+							width: 100%;
-							border-color: #2b5ce4;
+							height: 100%;
+							display: flex;
+							align-items: center;
+							justify-content: center;
+							border-radius: 8rpx;
+							border: 2rpx solid #e5e7eb;
 
 							text {
-								color: #2b5ce4;
+								font-size: 28rpx;
+								color: #4b5563;
 							}
 						}
+
+						&.active {
+							.month-circle {
+								background: #eef2ff;
+								border-color: #2b5ce4;
+
+								text {
+									color: #2b5ce4;
+								}
+							}
+						}
 					}
 				}
-			}
+
+				.modal-footer {
+					margin-top: 30rpx;
+					display: flex;
+					justify-content: center;
 
-			.modal-footer {
+					.back-btn {
-				margin-top: 30rpx;
+						padding: 20rpx 40rpx;
-				display: flex;
+						font-size: 28rpx;
-				justify-content: center;
+						color: #2b5ce4;
-
+						background: #eef2ff;
-				.back-btn {
+						border-radius: 8rpx;
-					padding: 20rpx 40rpx;
+					}
-					font-size: 28rpx;
-					color: #2b5ce4;
-					background: #eef2ff;
-					border-radius: 8rpx;
 				}
 			}
+		}
+
+		.signImg {
+			width: 280rpx;
+			height: 690rpx;
+			transform-origin: left top;
+			transform: rotate(-90deg) translateX(-280rpx);
 		}
 	}
-}
 </style>

pages/homePage/homePage.vue

@@ -31,7 +31,8 @@
 				</view>
 			</view>
 			<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">
 					<text class="warning-icon">⚠</text>
 					<text class="watext">工资表为系统自动生成，如有疑问请联系财务部门</text>
@@ -47,7 +48,8 @@
 
 				<!-- 年份选择 -->
 				<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">
 							<text>{{ year }}年</text>
 						</view>
@@ -56,7 +58,8 @@
 
 				<!-- 月份选择 -->
 				<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">
 							<text>{{ tempSelectedYear }}年{{ month < 10 ? '0' + month : month }}月</text>
 						</view>
@@ -64,280 +67,293 @@
 				</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>
 </template>
 
 <script>
+	export default {
+		data() {
+			const currentDate = new Date();
+			const currentYear = currentDate.getFullYear();
+			return {
+				// 今年
+				thisYear: '',
+				// 今月
+				thisMonth: '',
+				showModal: false,
+				currentYear,
+				selectedYear: currentYear,
+				selectedMonth: currentDate.getMonth(),
+				months: Array.from({
+					length: 12
+				}, (_, i) => i + 1),
+				currentStep: 'year',
+				tempSelectedYear: currentYear,
+				tempSelectedMonth: currentDate.getMonth(),
+				availableYears: Array.from({
+					length: 7
+				}, (_, i) => currentYear - 3 + i)
+			};
+		},
+		async created() {
+			this.thisYear = this.selectedYear
+			this.thisMonth = this.selectedMonth
+			this.$setNavigationBar('工资系统');
+			if (uni.getStorageSync('token')) {} else {
+				let a = await this.$login();
+			}
+		},
+		methods: {
+			showDatePicker() {
+				this.showModal = true;
+				this.currentStep = 'year';
+				this.tempSelectedYear = this.selectedYear;
+				this.tempSelectedMonth = this.selectedMonth;
+			},
+			closeDatePicker() {
+				this.showModal = false;
+				this.currentStep = 'year';
+			},
+			selectYear(year) {
+				this.tempSelectedYear = year;
+				this.currentStep = 'month';
+			},
+			selectMonth(month) {
+				this.tempSelectedMonth = month;
+				this.selectedYear = this.tempSelectedYear;
+				this.selectedMonth = month;
+				this.showModal = false;
+				this.currentStep = 'year';
+				this.$emit('dateSelected', {
+					year: this.selectedYear,
+					month: this.selectedMonth
+				});
+				console.log('选择月份触发');
+			},
+			backToYearSelect() {
+				this.currentStep = 'year';
+			},
+
+			viewDetails() {
+				this.$navTo('/pages/attendanceManagement/attendanceManagement');
+			},
+			viewSalaryDetails() {
+				this.$navTo(`/pages/salaryDetails/salaryDetails?year=${this.selectedYear}&month=${this.selectedMonth}`);
+			},
 
-export default {
-	data() {
-		const currentDate = new Date();
-		const currentYear = currentDate.getFullYear();
-		return {
-			// 今年
-			thisYear:'',
-			// 今月
-			thisMonth:'',
-			showModal: false,
-			currentYear,
-			selectedYear: currentYear,
-			selectedMonth: currentDate.getMonth(),
-			months: Array.from({ length: 12 }, (_, i) => i + 1),
-			currentStep: 'year',
-			tempSelectedYear: currentYear,
-			tempSelectedMonth: currentDate.getMonth(),
-			availableYears: Array.from({ length: 7 }, (_, i) => currentYear - 3 + i)
-		};
-	},
-	async created() {
-		this.thisYear = this.selectedYear
-		this.thisMonth = this.selectedMonth
-		this.$setNavigationBar('人资系统');
-		if (uni.getStorageSync('token')) {
-		} else {
-			let a = await this.$login();
 		}
-	},
+	};
-	methods: {
-		showDatePicker() {
-			this.showModal = true;
-			this.currentStep = 'year';
-			this.tempSelectedYear = this.selectedYear;
-			this.tempSelectedMonth = this.selectedMonth;
-		},
-		closeDatePicker() {
-			this.showModal = false;
-			this.currentStep = 'year';
-		},
-		selectYear(year) {
-			this.tempSelectedYear = year;
-			this.currentStep = 'month';
-		},
-		selectMonth(month) {
-			this.tempSelectedMonth = month;
-			this.selectedYear = this.tempSelectedYear;
-			this.selectedMonth = month;
-			this.showModal = false;
-			this.currentStep = 'year';
-			this.$emit('dateSelected', {
-				year: this.selectedYear,
-				month: this.selectedMonth
-			});
-			console.log('选择月份触发');
-		},
-		backToYearSelect() {
-			this.currentStep = 'year';
-		},
-
-		viewDetails() {
-			this.$navTo('/pages/attendanceManagement/attendanceManagement');
-		},
-		viewSalaryDetails(){
-			this.$navTo('/pages/salaryDetails/salaryDetails');
-		},
-		
-	}
-};
 </script>
 
 <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 {
-		background: #fff;
-		border-radius: 20rpx;
-		margin-top: 24rpx;
-		padding: 30rpx;
 
-		.section-header {
+		.section {
-			display: flex;
+			background: #fff;
-			justify-content: space-between;
+			border-radius: 20rpx;
-			align-items: center;
+			margin-top: 24rpx;
-			margin-bottom: 20rpx;
+			padding: 30rpx;
 
-			.left {
+			.section-header {
 				display: flex;
+				justify-content: space-between;
 				align-items: center;
+				margin-bottom: 20rpx;
 
-				.icon {
+				.left {
-					width: 48rpx;
+					display: flex;
-					height: 48rpx;
+					align-items: center;
-					margin-right: 10rpx;
+
+					.icon {
+						width: 48rpx;
+						height: 48rpx;
+						margin-right: 10rpx;
+					}
+
+					text {
+						font-family: Source Han Sans CN, Source Han Sans CN;
+						font-weight: 400;
+						font-size: 36rpx;
+						color: #111827;
+					}
 				}
-				text {
+
-					font-family: Source Han Sans CN, Source Han Sans CN;
+				.right {
-					font-weight: 400;
+					display: flex;
-					font-size: 36rpx;
+					align-items: center;
-					color: #111827;
+					color: #666;
+					font-size: 28rpx;
+
+					.blue-text {
+						font-family: Source Han Sans CN, Source Han Sans CN;
+						font-weight: 400;
+						font-size: 28rpx;
+						color: #2b5ce4;
+					}
+
+					.arrow {
+						transform: rotate(90deg);
+						width: 40rpx;
+						height: 40rpx;
+					}
 				}
 			}
 
-			.right {
+			.section-content {
-				display: flex;
+				margin-top: 35rpx;
-				align-items: center;
+
-				color: #666;
+				.title {
-				font-size: 28rpx;
+					font-family: Source Han Sans CN, Source Han Sans CN;
-				.blue-text {
+					font-weight: 400;
+					font-size: 30rpx;
+					color: #4b5563;
+				}
+
+				.combination {
+					display: flex;
+					align-items: center;
+				}
+
+				.detail {
 					font-family: Source Han Sans CN, Source Han Sans CN;
 					font-weight: 400;
 					font-size: 28rpx;
-					color: #2b5ce4;
+					color: #4b5563;
 				}
 
-				.arrow {
+				.icon {
-					transform: rotate(90deg);
 					width: 40rpx;
 					height: 40rpx;
 				}
-			}
-		}
 
-		.section-content {
+				.warning {
-			margin-top: 35rpx;
+					margin-top: 10rpx;
-			.title {
-				font-family: Source Han Sans CN, Source Han Sans CN;
-				font-weight: 400;
-				font-size: 30rpx;
-				color: #4b5563;
-			}
-			.combination {
-				display: flex;
-				align-items: center;
-			}
-			.detail {
-				font-family: Source Han Sans CN, Source Han Sans CN;
-				font-weight: 400;
-				font-size: 28rpx;
-				color: #4b5563;
-			}
-			.icon {
-				width: 40rpx;
-				height: 40rpx;
-			}
-
-			.warning {
-				margin-top: 10rpx;
-				display: flex;
-				align-items: center;
-				color: #ff6b01;
-				font-size: 28rpx;
-
-				.warning-icon {
-					margin-right: 10rpx;
-				}
-				.watext {
-					font-family: Source Han Sans CN, Source Han Sans CN;
-					font-weight: 400;
-					font-size: 24rpx;
-					color: #b9b9c2;
-				}
-			}
-		}
-	}
-
-	.view-details {
-		font-family: Source Han Sans CN, Source Han Sans CN;
-		margin-top: 42rpx;
-		height: 78rpx;
-		background: #0078ff;
-		border-radius: 20rpx;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		color: #fff;
-		font-size: 30rpx;
-	}
-
-	.date-picker-modal {
-		position: fixed;
-		top: 0;
-		left: 0;
-		right: 0;
-		bottom: 0;
-		background: rgba(0, 0, 0, 0.5);
-		z-index: 999;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-
-		.modal-content {
-			width: 690rpx;
-			background: #ffffff;
-			border-radius: 20rpx;
-			padding: 40rpx 30rpx;
-
-			.modal-title {
-				font-size: 32rpx;
-				color: #111827;
-				text-align: center;
-				margin-bottom: 40rpx;
-				font-weight: 500;
-			}
-
-			.year-grid,
-			.month-grid {
-				display: grid;
-				grid-template-columns: repeat(2, 1fr);
-				gap: 20rpx;
-				padding: 0 20rpx;
-
-				.year-item,
-				.month-item {
-					height: 88rpx;
 					display: flex;
 					align-items: center;
-					justify-content: center;
+					color: #ff6b01;
+					font-size: 28rpx;
 
-					.year-circle,
+					.warning-icon {
-					.month-circle {
+						margin-right: 10rpx;
-						width: 100%;
+					}
-						height: 100%;
+
+					.watext {
+						font-family: Source Han Sans CN, Source Han Sans CN;
+						font-weight: 400;
+						font-size: 24rpx;
+						color: #b9b9c2;
+					}
+				}
+			}
+		}
+
+		.view-details {
+			font-family: Source Han Sans CN, Source Han Sans CN;
+			margin-top: 42rpx;
+			height: 78rpx;
+			background: #0078ff;
+			border-radius: 20rpx;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			color: #fff;
+			font-size: 30rpx;
+		}
+
+		.date-picker-modal {
+			position: fixed;
+			top: 0;
+			left: 0;
+			right: 0;
+			bottom: 0;
+			background: rgba(0, 0, 0, 0.5);
+			z-index: 999;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+
+			.modal-content {
+				width: 690rpx;
+				background: #ffffff;
+				border-radius: 20rpx;
+				padding: 40rpx 30rpx;
+
+				.modal-title {
+					font-size: 32rpx;
+					color: #111827;
+					text-align: center;
+					margin-bottom: 40rpx;
+					font-weight: 500;
+				}
+
+				.year-grid,
+				.month-grid {
+					display: grid;
+					grid-template-columns: repeat(2, 1fr);
+					gap: 20rpx;
+					padding: 0 20rpx;
+
+					.year-item,
+					.month-item {
+						height: 88rpx;
 						display: flex;
 						align-items: center;
 						justify-content: center;
-						border-radius: 8rpx;
-						border: 2rpx solid #e5e7eb;
 
-						text {
-							font-size: 28rpx;
-							color: #4b5563;
-						}
-					}
-
-					&.active {
 						.year-circle,
 						.month-circle {
-							background: #eef2ff;
+							width: 100%;
-							border-color: #2b5ce4;
+							height: 100%;
+							display: flex;
+							align-items: center;
+							justify-content: center;
+							border-radius: 8rpx;
+							border: 2rpx solid #e5e7eb;
 
 							text {
-								color: #2b5ce4;
+								font-size: 28rpx;
+								color: #4b5563;
+							}
+						}
+
+						&.active {
+
+							.year-circle,
+							.month-circle {
+								background: #eef2ff;
+								border-color: #2b5ce4;
+
+								text {
+									color: #2b5ce4;
+								}
 							}
 						}
 					}
 				}
-			}
 
-			.modal-footer {
+				.modal-footer {
-				margin-top: 30rpx;
+					margin-top: 30rpx;
-				display: flex;
+					display: flex;
-				justify-content: center;
+					justify-content: center;
 
-				.back-btn {
+					.back-btn {
-					padding: 20rpx 40rpx;
+						padding: 20rpx 40rpx;
-					font-size: 28rpx;
+						font-size: 28rpx;
-					color: #2b5ce4;
+						color: #2b5ce4;
-					background: #eef2ff;
+						background: #eef2ff;
-					border-radius: 8rpx;
+						border-radius: 8rpx;
+					}
 				}
 			}
 		}
 	}
-}
 </style>

pages/salaryDetails/salaryDetails.vue

@@ -2,8 +2,8 @@
 	<view class="salary-details">
 		<!-- 顶部蓝色卡片 -->
 		<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>
 		</view>
 
@@ -13,43 +13,43 @@
 			<view class="salary-items">
 				<view class="item">
 					<text class="label">基本工资</text>
-					<text class="value">2500</text>
+					<text class="value">{{dataInfo.baseSalary}}</text>
 				</view>
 				<view class="item">
 					<text class="label">年度绩效奖金</text>
-					<text class="value">500</text>
+					<text class="value">{{dataInfo.annualPerformanceBonus}}</text>
 				</view>
 				<view class="item">
 					<text class="label">月度绩效奖金</text>
-					<text class="value">500</text>
+					<text class="value">{{dataInfo.monthlyPerformanceBonus}}</text>
 				</view>
 				<view class="item">
 					<text class="label">其他奖金</text>
-					<text class="value">1000</text>
+					<text class="value">{{dataInfo.otherBonus}}</text>
 				</view>
 				<view class="item">
 					<text class="label">总经理补贴</text>
-					<text class="value">0</text>
+					<text class="value">{{dataInfo.managerAllowance}}</text>
 				</view>
 				<view class="item">
 					<text class="label">交通补贴</text>
-					<text class="value">50</text>
+					<text class="value">{{dataInfo.transportationAllowance}}</text>
 				</view>
 				<view class="item">
 					<text class="label">其他补贴</text>
-					<text class="value">0</text>
+					<text class="value">{{dataInfo.otherAllowance}}</text>
 				</view>
 				<view class="item">
 					<text class="label">工龄工资</text>
-					<text class="value">50</text>
+					<text class="value">{{dataInfo.senioritySalary}}</text>
 				</view>
 				<view class="item">
 					<text class="label">加班工资</text>
-					<text class="value">0</text>
+					<text class="value">{{dataInfo.overtimePay}}</text>
 				</view>
 				<view class="item total">
 					<text class="label">应发小计</text>
-					<text class="value highlight">5000</text>
+					<text class="value highlight">{{dataInfo.grossPaySummary}}</text>
 				</view>
 			</view>
 		</view>
@@ -60,43 +60,44 @@
 			<view class="salary-items">
 				<view class="item">
 					<text class="label">年度绩效奖金</text>
-					<text class="value">2500</text>
+					<text class="value">{{dataInfo.annualPerformanceDeduction}}</text>
 				</view>
 				<view class="item">
 					<text class="label">月度绩效奖金</text>
-					<text class="value">500</text>
+					<text class="value">{{dataInfo.monthlyPerformanceDeduction}}</text>
 				</view>
 				<view class="item">
 					<text class="label">事假</text>
-					<text class="value">500</text>
+					<text class="value">{{dataInfo.personalLeaveDeduction}}</text>
 				</view>
 				<view class="item">
 					<text class="label">病假</text>
-					<text class="value">1000</text>
+					<text class="value">{{dataInfo.sickLeaveDeduction}}</text>
 				</view>
 				<view class="item">
 					<text class="label">婚假、丧假、陪产假</text>
-					<text class="value">0</text>
+					<text
+						class="value">{{dataInfo.marriageLeaveDeduction}}、{{dataInfo.bereavementLeaveDeduction}}、{{dataInfo.paternityLeaveDeduction}}</text>
 				</view>
 				<view class="item">
 					<text class="label">迟到、早退</text>
-					<text class="value">50</text>
+					<text class="value">{{dataInfo.lateEarlyDeduction}}</text>
 				</view>
 				<view class="item">
 					<text class="label">签到、签退</text>
-					<text class="value">0</text>
+					<text class="value">{{dataInfo.missedCheckInOutDeduction}}</text>
 				</view>
 				<view class="item">
 					<text class="label">缺卡</text>
-					<text class="value">50</text>
+					<text class="value">{{dataInfo.absentCardDeduction}}</text>
 				</view>
 				<view class="item">
 					<text class="label">旷工</text>
-					<text class="value">0</text>
+					<text class="value">{{dataInfo.absenteeismDeduction}}</text>
 				</view>
 				<view class="item">
 					<text class="label">违纪</text>
-					<text class="value">0</text>
+					<text class="value">{{dataInfo.violationDeduction}}</text>
 				</view>
 			</view>
 		</view>
@@ -107,23 +108,23 @@
 			<view class="salary-items">
 				<view class="item">
 					<text class="label">基本养老</text>
-					<text class="value">2500</text>
+					<text class="value">{{dataInfo.basicPensionDeduction}}</text>
 				</view>
 				<view class="item">
 					<text class="label">失业保险</text>
-					<text class="value">500</text>
+					<text class="value">{{dataInfo.unemploymentInsuranceDeduction}}</text>
 				</view>
 				<view class="item">
 					<text class="label">基本医疗</text>
-					<text class="value">500</text>
+					<text class="value">{{dataInfo.basicMedicalDeduction}}</text>
 				</view>
 				<view class="item">
 					<text class="label">大额医疗</text>
-					<text class="value">1000</text>
+					<text class="value">{{dataInfo.medicalDeductionAmount}}</text>
 				</view>
 				<view class="item">
 					<text class="label">住房公积金</text>
-					<text class="value">0</text>
+					<text class="value">{{dataInfo.housingFundDeduction}}</text>
 				</view>
 			</view>
 		</view>
@@ -134,127 +135,214 @@
 			<view class="salary-items">
 				<view class="item">
 					<text class="label">其他扣款</text>
-					<text class="value">2500</text>
+					<text class="value">{{dataInfo.otherDeduction}}</text>
 				</view>
 				<view class="item">
 					<text class="label">个税</text>
-					<text class="value">500</text>
+					<text class="value">{{dataInfo.individualTaxDeduction}}</text>
 				</view>
 				<view class="item total">
 					<text class="label">扣款小计</text>
-					<text class="value highlight red">2000</text>
+					<text class="value highlight red">{{dataInfo.deductionDetails}}</text>
 				</view>
 			</view>
 		</view>
 
 		<!-- 备注 -->
-		<view class="salary-section"><view>备注</view></view>
+		<view class="salary-section">
+			<view>备注</view>
+		</view>
 	</view>
 </template>
 
 <script>
-export default {
+	import {
-	data() {
+		getPayrollSheets
-		return {};
+	} from "../../api/create"
-	},
+	export default {
-	created() {
+		data() {
-		this.$setNavigationBar('工资条');
+			return {
-	}
+				month: "",
-};
+				year: "",
+				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>
 
 <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;
 
-	.salary-card {
+		.salary-card {
-		margin: 0 auto;
+			margin: 0 auto;
-		box-sizing: border-box;
+			box-sizing: border-box;
-		width: 690rpx;
+			width: 690rpx;
-		height: 326rpx;
+			height: 326rpx;
-		margin-top: 30rpx;
+			margin-top: 30rpx;
-		background: #0078ff;
+			background: #0078ff;
-		padding: 54rpx 30rpx 42rpx 30rpx;
+			padding: 54rpx 30rpx 42rpx 30rpx;
-		display: flex;
+			display: flex;
-		flex-direction: column;
+			flex-direction: column;
-		align-items: center;
+			align-items: center;
-		color: #ffffff;
+			color: #ffffff;
-		border-radius: 20rpx;
+			border-radius: 20rpx;
-		.date {
-			font-size: 32rpx;
-			margin-bottom: 20rpx;
-		}
 
-		.amount {
+			.date {
-			font-size: 72rpx;
+				font-size: 32rpx;
-			font-weight: 500;
+				margin-bottom: 20rpx;
-			margin-bottom: 30rpx;
+			}
-		}
 
-		.tips {
+			.amount {
-			font-family: Source Han Sans CN, Source Han Sans CN;
+				font-size: 72rpx;
-			font-weight: 400;
+				font-weight: 500;
-			font-size: 24rpx;
-			color: rgba(255, 255, 255, 0.6);
-		}
-	}
-
-	.salary-section {
-		background: #ffffff;
-		margin: 20rpx 30rpx 0;
-		border-radius: 12rpx;
-		padding: 30rpx;
-
-		.section-title {
-			font-size: 32rpx;
-			color: #111827;
-			font-weight: 500;
-			margin-bottom: 30rpx;
-		}
-
-		.salary-items {
-			.item {
-				display: flex;
-				justify-content: space-between;
-				align-items: center;
 				margin-bottom: 30rpx;
+			}
 
-				&:last-child {
+			.tips {
-					margin-bottom: 0;
+				font-family: Source Han Sans CN, Source Han Sans CN;
-				}
+				font-weight: 400;
+				font-size: 24rpx;
+				color: rgba(255, 255, 255, 0.6);
+			}
+		}
 
-				.label {
+		.salary-section {
-					font-size: 28rpx;
+			background: #ffffff;
-					color: #4b5563;
+			margin: 20rpx 30rpx 0;
-				}
+			border-radius: 12rpx;
+			padding: 30rpx;
 
-				.value {
+			.section-title {
-					font-size: 28rpx;
+				font-size: 32rpx;
-					color: #4b5563;
+				color: #111827;
-				}
+				font-weight: 500;
+				margin-bottom: 30rpx;
+			}
 
-				&.total {
+			.salary-items {
-					margin-top: 20rpx;
+				.item {
-					padding-top: 20rpx;
+					display: flex;
-					border-top: 2rpx solid #e5e7eb;
+					justify-content: space-between;
+					align-items: center;
+					margin-bottom: 30rpx;
 
-					.label {
+					&:last-child {
-						font-weight: 500;
+						margin-bottom: 0;
 					}
 
-					.value.highlight {
+					.label {
-						font-weight: 700;
+						font-size: 28rpx;
-						font-size: 32rpx;
+						color: #4b5563;
-						color: #0078ff;
+					}
-						&.red {
+
-							color: #ff4d4f;
+					.value {
+						font-size: 28rpx;
+						color: #4b5563;
+					}
+
+					&.total {
+						margin-top: 20rpx;
+						padding-top: 20rpx;
+						border-top: 2rpx solid #e5e7eb;
+
+						.label {
+							font-weight: 500;
+						}
+
+						.value.highlight {
+							font-weight: 700;
+							font-size: 32rpx;
+							color: #0078ff;
+
+							&.red {
+								color: #ff4d4f;
+							}
 						}
 					}
 				}
 			}
 		}
 	}
-}
 </style>

pages/sign/sign.vue

@@ -1,18 +1,9 @@
 <template>
 	<view class="sing-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 class="tips">请在空白区域内横向签字</view>
 		<view class="button-box">
@@ -23,194 +14,214 @@
 </template>
 
 <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,
-	data() {
+	} from '@/api/create.js';
-		return {
+	export default {
-			signature: '',
+		data() {
-			width: '',
+			return {
-			height: '',
+				signature: '',
-			scale: 1,
+				width: '',
-			imgurl: '',
+				height: '',
-			
-		};
-	},
-	onLoad(obj) {
-		this.$setNavigationBar('手写签名');
-		this.initSignature();
-		dd.getSystemInfo({
-			success: res => {
-				// console.log(res)
-				this.width = res.windowWidth;
-				this.height = res.windowHeight;
-			}
-		});
-	},
-	methods: {
-		// 点击清除
-		onClickClear() {
-			setTimeout(() => {
-				this.initSignature();
-			}, 10);
-		},
-		// 点击确认
-		onClickAffirm() {
-			uni.showLoading({ title: '提交中', mask: true });
-			this.signature.getImagePath().then(res => {
-				var pages = getCurrentPages();
-				var previousPage = pages[pages.length - 2];
-				uni.uploadFile({
-					url: baseUrl + '/file/upload',
-					fileName: 'file',
-					header: {
-						Authorization: JSON.parse(uni.getStorageSync('token'))
-					},
-					fileType: 'image', // 必填
-					filePath: res,
-					success: async res => {
-						let data = JSON.parse(res.data);
-						if (data.code == 200) {
-							uni.hideLoading();
-							// 把值给前一个页面中的data
-							// previousPage.$vm.signatureAddress = data.data
-							console.log(data, '地址');
-							let obj = {
-								id: '',
-								meetingMinutesSign: ''
-							};
-							obj.id = this.meetingId;
-							obj.meetingMinutesSign = data.data;
-							let signRes = await signatureOfMeetingMinutesApi(obj);
-							if (signRes.code == 200) {
-								uni.showToast({
-									title: '签字成功',
-									duration: 2000
-								});
-							} else {
-								uni.showToast({
-									title: '服务器错误，有结果！'
-								});
-							}
-
-							uni.navigateBack();
-						} else {
-							uni.showToast({ title: data.msg, icon: 'error' });
-						}
-					},
-					fail: err => {
-						uni.showToast({ title: err, icon: 'error' });
-					}
-				});
-			});
-		},
-		// 初始化
-		initSignature() {
-			const ctx = uni.createCanvasContext('cansignature');
-			const _this = this;
-			this.signature = new Signature(ctx, {
-				width: _this.width,
-				height: _this.height,
 				scale: 1,
-				color: '#000000',
+				imgurl: '',
-				bgColor: '#ffffff',
+				id: ''
-				getImagePath: () => {
+			};
-					return new Promise(resolve => {
+		},
-						ctx.toTempFilePath({
+		onLoad(option) {
-							success: res => resolve(res.filePath)
+			this.id = option.id
-						});
+			console.log(option.id);
-					});
+		},
-				},
+		onShow() {
-				toDataURL: function(res) {
+			this.$setNavigationBar('手写签名');
-					return this;
+			this.initSignature();
+			dd.getSystemInfo({
+				success: res => {
+					// console.log(res)
+					this.width = res.windowWidth;
+					this.height = res.windowHeight;
 				}
 			});
 		},
-		// 绑定touchstart事件
+		methods: {
-		handleTouchStart(e) {
+			// 点击清除
-			const pos = e.touches[0];
+			onClickClear() {
-			this.signature.onDrawStart(pos.x, pos.y);
+				setTimeout(() => {
-		},
+					this.initSignature();
-		// 绑定touchmove事件
+				}, 10);
-		handleTouchMove(e) {
+			},
-			const pos = e.touches[0];
+			// 点击确认
-			this.signature.onDrawMove(pos.x, pos.y);
+			onClickAffirm() {
-		},
+				uni.showLoading({
-		// 绑定touchend/touchcancel事件
+					title: '提交中',
-		handleTouchEnd() {
+					mask: true
-			this.signature.onDrawEnd();
+				});
+				console.log(this.signature);
+				this.signature.toDataURL().then(res => {
+					console.log(res);
+					uni.uploadFile({
+						url: baseUrl + '/file',
+						fileName: 'files',
+						header: {
+							Authorization: 'Bearer ' + uni.getStorageSync('token')
+						},
+						fileType: 'image', // 必填
+						filePath: res,
+						success: async res => {
+							let data = JSON.parse(res.data);
+							if (data.errmsg == "ok") {
+								uni.hideLoading();
+								console.log(data.result[0], [this.id], '地址');
+								let obj = {
+									ids: [this.id],
+									signatureImg: data.result[0]
+								};
+								obj.id = this.meetingId;
+								obj.meetingMinutesSign = data.data;
+								let signRes = await signatureOfMeetingMinutesApi(obj);
+								if (signRes.errmsg == "ok") {
+									uni.showToast({
+										title: '签字成功',
+										duration: 2000
+									});
+								} else {
+									uni.showToast({
+										title: '服务器错误，有结果！'
+									});
+								}
+								setTimeout(() => {
+									uni.navigateBack();
+								}, 1000)
+
+							} else {
+								uni.showToast({
+									title: data.msg,
+									icon: 'error'
+								});
+							}
+						},
+						fail: err => {
+							uni.showToast({
+								title: err,
+								icon: 'error'
+							});
+						}
+					});
+				});
+			},
+			// 初始化
+			initSignature() {
+				const ctx = uni.createCanvasContext('cansignature');
+				const _this = this;
+				this.signature = new Signature(ctx, {
+					width: _this.width,
+					height: _this.height,
+					scale: 1,
+					color: '#000000',
+					bgColor: '#ffffff',
+					toDataURL: function(res) {
+						return new Promise(resolve => {
+							ctx.toTempFilePath({
+								success: res => resolve(res.filePath)
+							});
+						});
+					}
+				});
+
+
+			},
+			// 绑定touchstart事件
+			handleTouchStart(e) {
+				const pos = e.touches[0];
+				this.signature.onDrawStart(pos.x, pos.y);
+			},
+			// 绑定touchmove事件
+			handleTouchMove(e) {
+				const pos = e.touches[0];
+				this.signature.onDrawMove(pos.x, pos.y);
+			},
+			// 绑定touchend/touchcancel事件
+			handleTouchEnd() {
+				this.signature.onDrawEnd();
+			}
 		}
-	}
+	};
-};
 </script>
 
 <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);
-	padding: 0 0rpx 0 0;
+		padding: 0 0rpx 0 0;
-	box-sizing: border-box;
+		box-sizing: border-box;
-	display: flex;
-	overflow: hidden;
-	.tips {
-		position: fixed;
-		right: 0;
-		top: 0;
-		z-index: 100000000000;
-		// top: 200rpx;
-		font-size: 26rpx;
-		font-family: Source Han Sans CN, Source Han Sans CN-Regular;
-		font-weight: 400;
-		text-align: LEFT;
-		color: #b9b9c2;
-		line-height: 40rpx;
-		transform: rotateZ(90deg) translateX(60%) translateY(-250%);
-	}
-	.label {
-		width: 150rpx;
-		color: #002567;
-		font-size: 28rpx;
-		line-height: 70rpx;
-		font-weight: 500;
-	}
-	.canvas-box {
-		position: relative;
-		z-index: 0;
-		width: 100%;
-		height: 100%;
-	}
-	.button-box {
-		position: fixed;
-		left: 0;
-		bottom: 0;
-		z-index: 10000;
 		display: flex;
-		transform: rotate(90deg) translateX(-50%) translateY(80%);
+		overflow: hidden;
-		.clear-button {
+
-			width: 142rpx;
+		.tips {
-			height: 80rpx;
+			position: fixed;
-			line-height: 80rpx;
+			right: 0;
-			background: #ffffff;
+			top: 0;
-			border: 2rpx solid #2976ff;
+			z-index: 100000000000;
-			color: #2976ff;
+			// top: 200rpx;
-			font-size: 24rpx;
+			font-size: 26rpx;
-			border-radius: 10rpx;
+			font-family: Source Han Sans CN, Source Han Sans CN-Regular;
-			text-align: center;
+			font-weight: 400;
-			box-sizing: border-box;
+			text-align: LEFT;
-			margin-right: 18rpx;
+			color: #b9b9c2;
+			line-height: 40rpx;
+			transform: rotateZ(90deg) translateX(60%) translateY(-250%);
 		}
-		.affirm-button {
+
-			width: 142rpx;
+		.label {
-			height: 80rpx;
+			width: 150rpx;
-			line-height: 80rpx;
+			color: #002567;
-			background: #2976ff;
+			font-size: 28rpx;
-			border-radius: 10rpx;
+			line-height: 70rpx;
-			text-align: center;
+			font-weight: 500;
-			color: #ffffff;
+		}
-			font-size: 24rpx;
+
+		.canvas-box {
+			position: relative;
+			z-index: 0;
+			width: 100%;
+			height: 100%;
+		}
+
+		.button-box {
+			position: fixed;
+			left: 0;
+			bottom: 0;
+			z-index: 10000;
+			display: flex;
+			transform: rotate(90deg) translateX(-50%) translateY(80%);
+
+			.clear-button {
+				width: 142rpx;
+				height: 80rpx;
+				line-height: 80rpx;
+				background: #ffffff;
+				border: 2rpx solid #2976ff;
+				color: #2976ff;
+				font-size: 24rpx;
+				border-radius: 10rpx;
+				text-align: center;
+				box-sizing: border-box;
+				margin-right: 18rpx;
+			}
+
+			.affirm-button {
+				width: 142rpx;
+				height: 80rpx;
+				line-height: 80rpx;
+				background: #2976ff;
+				border-radius: 10rpx;
+				text-align: center;
+				color: #ffffff;
+				font-size: 24rpx;
+			}
 		}
 	}
-}
 </style>