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,13 +1,15 @@
 /*首页*/
-import { request, requestLogin } from "./index.js";
+import {
+	request,
+	requestLogin
+} from "./index.js";
 
 //  登录
 export function getToken(authCode) {
 	return requestLogin({
 		method: "GET",
 		url: `/login?code=${authCode}`,
-		data: {
+		data: {},
-		},
 		Header1: {
 
 		}
@@ -18,8 +20,7 @@ export function getUser(authCode){
 	return request({
 		method: "get",
 		url: "/user",
-		data: {
+		data: {},
-		},
 	})
 }
 // 获取绩效考勤统计
@@ -29,3 +30,23 @@ export function getPerformanceAttendanceApi(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 格式
+		}
+	})
+}

api/index.js

@@ -1,8 +1,12 @@
-
 import allUrl from "./baseUrl.js"
 // const baseUrl = bootUrl
 export function request(optaions) {
-	let { url, method, data, header1 } = optaions
+	let {
+		url,
+		method,
+		data,
+		header1
+	} = optaions
 	method = method || "GET"
 	data = data || {}
 	let newData = {}
@@ -23,16 +27,25 @@ export function request ( optaions ) {
 			data,
 			success: (res) => {
 				if (res.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' });
+						uni.reLaunch({
+							url: '/pages/homePage/homePage'
+						});
 					}, 1000);
 				} else if (res.data.errcode != 0) {
 					console.log('不正确走的')
 					reject(res)
-					uni.showToast({ title: res.data.errmsg, icon: 'none', duration: 2000 });
+					uni.showToast({
+						title: res.data.errmsg,
+						icon: 'none',
+						duration: 2000
+					});
 				} else {
 					reslove(res.data)
 				}
@@ -42,22 +55,36 @@ export function request ( optaions ) {
 				console.log('请求失败', err)
 				uni.hideLoading()
 				if (err.statusCode == 401) {
-					uni.showToast({ title: '登录已失效,即将重新登录！', icon: 'none' });
+					uni.showToast({
+						title: '登录已失效,即将重新登录！',
+						icon: 'none'
+					});
 					uni.removeStorageSync('userInfo');
 					uni.removeStorageSync('token');
 					setTimeout(() => {
-						uni.reLaunch({ url: '/pages/newHomePage/newHomePage' });
+						uni.reLaunch({
+							url: '/pages/homePage/homePage'
+						});
 					}, 1000);
 				}
 				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' });
+						uni.reLaunch({
+							url: '/pages/homePage/homePage'
+						});
 					}, 1000);
 				} else {
-					uni.showToast({ title: err.data.errmsg, icon: 'none' });
+					uni.showToast({
+						title: err.data.errmsg,
+						icon: 'none'
+					});
 				}
 				reject()
 			},
@@ -72,7 +99,12 @@ export function request ( optaions ) {
 
 
 export function requestLogin(optaions) {
-	let { url, method, data } = optaions
+	let {
+		url,
+		method,
+		data,
+		header
+	} = optaions
 	method = method || "GET"
 	data = data || {}
 	let newData = {}
@@ -87,17 +119,27 @@ export function requestLogin ( optaions ) {
 			url: allUrl + url,
 			method,
 			data,
+			header,
 			success: (res) => {
 				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'
+					// 	});
+					// }, 1000);
 				} else if (res.statusCode != 200) {
 					reject(res)
-					uni.showToast({ title: res.data.msg, icon: 'none', duration: 2000 });
+					uni.showToast({
+						title: res.data.msg,
+						icon: 'none',
+						duration: 2000
+					});
 				} else {
 					reslove(res.data)
 				}

main.js

@@ -2,9 +2,14 @@ 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
@@ -112,7 +117,9 @@ app.$mount()
 
 
 // #ifdef VUE3
-import { createSSRApp } from 'vue'
+import {
+	createSSRApp
+} from 'vue'
 export function createApp() {
 	const app = createSSRApp(App)
 	return {

manifest.json

@@ -10,7 +10,6 @@
         "usingComponents" : true,
         "nvueStyleCompiler" : "uni-app",
         "compilerVersion" : 3,
-		
         "splashscreen" : {
             "alwaysShowBeforeRender" : true,
             "waiting" : true,
@@ -58,7 +57,8 @@
         "usingComponents" : true
     },
     "mp-alipay" : {
-		"usingComponents": true
+        "usingComponents" : true,
+        "appid" : "3898417134"
     },
     "mp-baidu" : {
         "usingComponents" : true

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,12 +3,15 @@
 		<!-- 月份选择 -->
 		<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="title">{{attendanceData.status=="1"?"试用":"正式"}}</view>
 			<!-- 打卡统计 -->
 			<view class="stat-section">
 				<view class="section-title">打卡统计</view>
@@ -108,20 +111,31 @@
 
 			<!-- 底部说明 -->
 			<view class="bottom-tips">说明：请核实当月考勤记录，确认无误请签字确认</view>
-
 			<!-- 员工签字 -->
 
-		<view class="sign">
+			<view class="sign" v-if="attendanceData.signatureImg">
 				<view class="sign-tit">
 					员工签字
 					<text>/保留员工签字</text>
 				</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 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,14 +163,18 @@
 				</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 {
+		getPerformanceAttendanceApi
+	} from '@/api/create.js';
 	export default {
 		data() {
 			const currentDate = new Date();
@@ -164,12 +184,16 @@ export default {
 				currentYear,
 				selectedYear: currentYear,
 				selectedMonth: currentDate.getMonth(),
-			months: Array.from({ length: 12 }, (_, i) => i + 1),
+				months: Array.from({
+					length: 12
+				}, (_, i) => i + 1),
 				currentStep: 'year', // 'year' 或 'month'
 				tempSelectedYear: currentYear,
 				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: ' ',
 					// 严重迟到
@@ -209,10 +233,11 @@ export default {
 					restdayOvertime: ' ',
 					// 工作日加班
 					workdayOvertime: ' '
-			}
+				}]
 			};
 		},
-	created() {
+
+		onShow() {
 			this.getPerformanceAttendance();
 			this.$setNavigationBar('考勤管理');
 		},
@@ -246,8 +271,8 @@ export default {
 			backToYearSelect() {
 				this.currentStep = 'year';
 			},
-		goSignIt() {
+			goSignIt(attendanceData) {
-			this.$navTo('/pages/sign/sign');
+				this.$navTo('/pages/sign/sign?id=' + attendanceData.id);
 			},
 			async getPerformanceAttendance() {
 				uni.showLoading({
@@ -256,8 +281,24 @@ export default {
 				})
 
 				let res = await getPerformanceAttendanceApi(this.selectedYear, this.selectedMonth);
-			this.attendanceData = res.result;
 				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
+								});
+							}
+						}
+					});
+				}
 			}
 		}
 	};
@@ -275,11 +316,13 @@ export default {
 			align-items: center;
 			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;
@@ -302,11 +345,18 @@ export default {
 			}
 		}
 
+		.box {
+			.title {
+				padding-bottom: 28rpx;
+			}
+		}
+
 		.stat-section {
 			background: #fff;
 			border-radius: 12rpx;
 			padding: 35rpx 40rpx;
 			margin-bottom: 20rpx;
+
 			.section-title {
 				font-size: 32rpx;
 				color: #111827;
@@ -332,6 +382,7 @@ export default {
 					.value {
 						font-size: 32rpx;
 						color: #666;
+
 						&.red-text {
 							color: #ff4d4f;
 						}
@@ -346,9 +397,11 @@ export default {
 			font-size: 24rpx;
 			color: #b9b9c2;
 		}
+
 		.sign {
 			margin-top: 32rpx;
-		margin-bottom: 180rpx;
+			margin-bottom: 32rpx;
+
 			.sign-tit {
 				margin-bottom: 32rpx;
 				margin-left: 8rpx;
@@ -356,6 +409,7 @@ export default {
 				font-weight: 700;
 				font-size: 28rpx;
 				color: #000000;
+
 				text {
 					padding-left: 16rpx;
 					font-family: Source Han Sans CN, Source Han Sans CN;
@@ -364,6 +418,7 @@ export default {
 					color: #b9b9c2;
 				}
 			}
+
 			.signatureVersion {
 				width: 690rpx;
 				height: 280rpx;
@@ -373,11 +428,10 @@ export default {
 		}
 
 		.confirm-btn {
-		position: fixed;
-		bottom: 45rpx;
 			left: 20rpx;
 			right: 20rpx;
 			height: 78rpx;
+			margin-bottom: 40rpx;
 			background: #ffffff;
 			border-radius: 20rpx;
 			display: flex;
@@ -512,5 +566,12 @@ export default {
 				}
 			}
 		}
+
+		.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,14 +67,15 @@
 				</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();
@@ -85,19 +89,22 @@ export default {
 				currentYear,
 				selectedYear: currentYear,
 				selectedMonth: currentDate.getMonth(),
-			months: Array.from({ length: 12 }, (_, i) => i + 1),
+				months: Array.from({
+					length: 12
+				}, (_, i) => i + 1),
 				currentStep: 'year',
 				tempSelectedYear: currentYear,
 				tempSelectedMonth: currentDate.getMonth(),
-			availableYears: Array.from({ length: 7 }, (_, i) => currentYear - 3 + i)
+				availableYears: Array.from({
+					length: 7
+				}, (_, i) => currentYear - 3 + i)
 			};
 		},
 		async created() {
 			this.thisYear = this.selectedYear
 			this.thisMonth = this.selectedMonth
-		this.$setNavigationBar('人资系统');
+			this.$setNavigationBar('工资系统');
-		if (uni.getStorageSync('token')) {
+			if (uni.getStorageSync('token')) {} else {
-		} else {
 				let a = await this.$login();
 			}
 		},
@@ -136,7 +143,7 @@ export default {
 				this.$navTo('/pages/attendanceManagement/attendanceManagement');
 			},
 			viewSalaryDetails() {
-			this.$navTo('/pages/salaryDetails/salaryDetails');
+				this.$navTo(`/pages/salaryDetails/salaryDetails?year=${this.selectedYear}&month=${this.selectedMonth}`);
 			},
 
 		}
@@ -149,6 +156,7 @@ export default {
 		min-height: 100vh;
 		background-color: #f8f9fa;
 		padding: 0 30rpx;
+
 		.section {
 			background: #fff;
 			border-radius: 20rpx;
@@ -170,6 +178,7 @@ export default {
 						height: 48rpx;
 						margin-right: 10rpx;
 					}
+
 					text {
 						font-family: Source Han Sans CN, Source Han Sans CN;
 						font-weight: 400;
@@ -183,6 +192,7 @@ export default {
 					align-items: center;
 					color: #666;
 					font-size: 28rpx;
+
 					.blue-text {
 						font-family: Source Han Sans CN, Source Han Sans CN;
 						font-weight: 400;
@@ -200,22 +210,26 @@ export default {
 
 			.section-content {
 				margin-top: 35rpx;
+
 				.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;
@@ -231,6 +245,7 @@ export default {
 					.warning-icon {
 						margin-right: 10rpx;
 					}
+
 					.watext {
 						font-family: Source Han Sans CN, Source Han Sans CN;
 						font-weight: 400;
@@ -311,6 +326,7 @@ export default {
 						}
 
 						&.active {
+
 							.year-circle,
 							.month-circle {
 								background: #eef2ff;

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,31 +135,116 @@
 			<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>
+	import {
+		getPayrollSheets
+	} from "../../api/create"
 	export default {
 		data() {
-		return {};
+			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: '',
+				}
+			};
 		},
-	created() {
+		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>
@@ -182,6 +268,7 @@ export default {
 			align-items: center;
 			color: #ffffff;
 			border-radius: 20rpx;
+
 			.date {
 				font-size: 32rpx;
 				margin-bottom: 20rpx;
@@ -248,6 +335,7 @@ export default {
 							font-weight: 700;
 							font-size: 32rpx;
 							color: #0078ff;
+
 							&.red {
 								color: #ff4d4f;
 							}

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">
@@ -25,7 +16,9 @@
 <script>
 	import Signature from 'mini-smooth-signature';
 	import baseUrl from '@/api/baseUrl.js';
-import { signatureOfMeetingMinutesApi } from '@/api/create.js';
+	import {
+		signatureOfMeetingMinutesApi,
+	} from '@/api/create.js';
 	export default {
 		data() {
 			return {
@@ -34,10 +27,14 @@ export default {
 				height: '',
 				scale: 1,
 				imgurl: '',
-			
+				id: ''
 			};
 		},
-	onLoad(obj) {
+		onLoad(option) {
+			this.id = option.id
+			console.log(option.id);
+		},
+		onShow() {
 			this.$setNavigationBar('手写签名');
 			this.initSignature();
 			dd.getSystemInfo({
@@ -57,33 +54,34 @@ export default {
 			},
 			// 点击确认
 			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({
-					url: baseUrl + '/file/upload',
+						url: baseUrl + '/file',
-					fileName: 'file',
+						fileName: 'files',
 						header: {
-						Authorization: JSON.parse(uni.getStorageSync('token'))
+							Authorization: 'Bearer ' + uni.getStorageSync('token')
 						},
 						fileType: 'image', // 必填
 						filePath: res,
 						success: async res => {
 							let data = JSON.parse(res.data);
-						if (data.code == 200) {
+							if (data.errmsg == "ok") {
 								uni.hideLoading();
-							// 把值给前一个页面中的data
+								console.log(data.result[0], [this.id], '地址');
-							// previousPage.$vm.signatureAddress = data.data
-							console.log(data, '地址');
 								let obj = {
-								id: '',
+									ids: [this.id],
-								meetingMinutesSign: ''
+									signatureImg: data.result[0]
 								};
 								obj.id = this.meetingId;
 								obj.meetingMinutesSign = data.data;
 								let signRes = await signatureOfMeetingMinutesApi(obj);
-							if (signRes.code == 200) {
+								if (signRes.errmsg == "ok") {
 									uni.showToast({
 										title: '签字成功',
 										duration: 2000
@@ -93,14 +91,22 @@ export default {
 										title: '服务器错误，有结果！'
 									});
 								}
-
+								setTimeout(() => {
 									uni.navigateBack();
+								}, 1000)
+
 							} else {
-							uni.showToast({ title: data.msg, icon: 'error' });
+								uni.showToast({
+									title: data.msg,
+									icon: 'error'
+								});
 							}
 						},
 						fail: err => {
-						uni.showToast({ title: err, icon: 'error' });
+							uni.showToast({
+								title: err,
+								icon: 'error'
+							});
 						}
 					});
 				});
@@ -115,17 +121,16 @@ export default {
 					scale: 1,
 					color: '#000000',
 					bgColor: '#ffffff',
-				getImagePath: () => {
+					toDataURL: function(res) {
 						return new Promise(resolve => {
 							ctx.toTempFilePath({
 								success: res => resolve(res.filePath)
 							});
 						});
-				},
-				toDataURL: function(res) {
-					return this;
 					}
 				});
+
+
 			},
 			// 绑定touchstart事件
 			handleTouchStart(e) {
@@ -154,6 +159,7 @@ export default {
 		box-sizing: border-box;
 		display: flex;
 		overflow: hidden;
+
 		.tips {
 			position: fixed;
 			right: 0;
@@ -168,6 +174,7 @@ export default {
 			line-height: 40rpx;
 			transform: rotateZ(90deg) translateX(60%) translateY(-250%);
 		}
+
 		.label {
 			width: 150rpx;
 			color: #002567;
@@ -175,12 +182,14 @@ export default {
 			line-height: 70rpx;
 			font-weight: 500;
 		}
+
 		.canvas-box {
 			position: relative;
 			z-index: 0;
 			width: 100%;
 			height: 100%;
 		}
+
 		.button-box {
 			position: fixed;
 			left: 0;
@@ -188,6 +197,7 @@ export default {
 			z-index: 10000;
 			display: flex;
 			transform: rotate(90deg) translateX(-50%) translateY(80%);
+
 			.clear-button {
 				width: 142rpx;
 				height: 80rpx;
@@ -201,6 +211,7 @@ export default {
 				box-sizing: border-box;
 				margin-right: 18rpx;
 			}
+
 			.affirm-button {
 				width: 142rpx;
 				height: 80rpx;