From f4d8e8817313cc98fe70684931aebed718c6bf26 Mon Sep 17 00:00:00 2001
From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com>
Date: Wed, 22 Oct 2025 09:31:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=8A=E6=B5=B7=E5=B7=A5?=
=?UTF-8?q?=E7=A8=8B=E5=85=A5=E5=9C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.env.development | 4 +-
src/pages.json | 21 +
src/pages/machine-setting/index.vue | 1 -
.../child-pages/addAndEditPerson.vue | 143 +++--
.../child-pages/projectSetting.vue | 210 +++++++
src/pages/person-entry/index.vue | 9 +
src/pages/person-exit/data-upload/index.vue | 4 -
src/pages/select-project/index.vue | 23 +-
.../child-pages/addProject.vue | 592 ++++++++++++++++++
src/pages/shProjectDetails/index.vue | 210 +++++++
src/services/shProjectSetting.js | 19 +
src/static/image/person/pro_setting.png | Bin 0 -> 4790 bytes
12 files changed, 1151 insertions(+), 85 deletions(-)
create mode 100644 src/pages/person-entry/child-pages/projectSetting.vue
create mode 100644 src/pages/shProjectDetails/child-pages/addProject.vue
create mode 100644 src/pages/shProjectDetails/index.vue
create mode 100644 src/services/shProjectSetting.js
create mode 100644 src/static/image/person/pro_setting.png
diff --git a/.env.development b/.env.development
index 665f142..5be6066 100644
--- a/.env.development
+++ b/.env.development
@@ -1,4 +1,4 @@
# VITE_API_BASE_URL = http://112.29.103.165:1616
-VITE_API_BASE_URL = /api
-# VITE_API_BASE_URL = http://192.168.0.14:1999/hd-realname/prod-api
+# VITE_API_BASE_URL = /api
+VITE_API_BASE_URL = http://192.168.0.14:1999/hd-real-name
# VITE_API_BASE_URL = http://192.168.0.234:38080
diff --git a/src/pages.json b/src/pages.json
index ed91632..32ec856 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -97,6 +97,13 @@
"navigationBarTitleText": "人脸识别查找"
}
},
+ // 上海人员多工程设置
+ {
+ "path": "pages/person-entry/child-pages/projectSetting",
+ "style": {
+ "navigationBarTitleText": "上海人员多工程设置"
+ }
+ },
// 人员出场
{
@@ -183,6 +190,20 @@
"style": {
"navigationBarTitleText": "考勤机设置"
}
+ },
+ // 上海多工程设置明细
+ {
+ "path": "pages/shProjectDetails/index",
+ "style": {
+ "navigationBarTitleText": "上海多工程设置明细"
+ }
+ },
+ // 新增入场工程
+ {
+ "path": "pages/shProjectDetails/child-pages/addProject",
+ "style": {
+ "navigationBarTitleText": "新增入场工程"
+ }
}
],
"globalStyle": {
diff --git a/src/pages/machine-setting/index.vue b/src/pages/machine-setting/index.vue
index 69c07e3..52ab251 100644
--- a/src/pages/machine-setting/index.vue
+++ b/src/pages/machine-setting/index.vue
@@ -158,7 +158,6 @@ const onMachineSettingItem = (item) => {
// 刷新机器列表的处理函数
const handleRefreshMachineList = (eventData) => {
- console.log('收到刷新机器列表事件:', eventData)
// 重置分页参数
queryParams.value.pageNum = 1
// 刷新列表数据
diff --git a/src/pages/person-entry/child-pages/addAndEditPerson.vue b/src/pages/person-entry/child-pages/addAndEditPerson.vue
index 572bea8..c01eedd 100644
--- a/src/pages/person-entry/child-pages/addAndEditPerson.vue
+++ b/src/pages/person-entry/child-pages/addAndEditPerson.vue
@@ -1,81 +1,78 @@
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/person-entry/child-pages/projectSetting.vue b/src/pages/person-entry/child-pages/projectSetting.vue
new file mode 100644
index 0000000..3a6e79c
--- /dev/null
+++ b/src/pages/person-entry/child-pages/projectSetting.vue
@@ -0,0 +1,210 @@
+
+
+
+
+
+
+
+ 身份证号码:
+
+
+
+
+
+ 上海人员多工程设置说明:
+
+ 1.请确保该人员已经入场一个上海工程
+
+ 2.每个工程,人员只能存在一条在场数据,即一个工程只能入场一次
+
+
+ 3.如需出场,请至
+ 【人员出场】
+ 模块进行单个工程出场操作
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/person-entry/index.vue b/src/pages/person-entry/index.vue
index 5c26cf8..244bae2 100644
--- a/src/pages/person-entry/index.vue
+++ b/src/pages/person-entry/index.vue
@@ -30,6 +30,7 @@
import AddIcon from '@/static/image/person/add.png'
import EditIcon from '@/static/image/person/edit.png'
import FaceIcon from '@/static/image/person/face.png'
+import ProSettingIcon from '@/static/image/person/pro_setting.png'
import { ref } from 'vue'
const showLoading = ref(false) // 是否显示加载中
@@ -60,6 +61,14 @@ const handleList = [
bgc_color_2: '#91cbf0',
url: '/pages/person-entry/child-pages/faceRecognition',
},
+ {
+ name: 'proSetting',
+ icon: ProSettingIcon,
+ title: '上海人员多工程设置',
+ bgc_color_1: '#ffb152',
+ bgc_color_2: '#ff9130',
+ url: '/pages/person-entry/child-pages/projectSetting',
+ },
]
// 点击跳转
diff --git a/src/pages/person-exit/data-upload/index.vue b/src/pages/person-exit/data-upload/index.vue
index ef47ce4..2f33e6f 100644
--- a/src/pages/person-exit/data-upload/index.vue
+++ b/src/pages/person-exit/data-upload/index.vue
@@ -96,7 +96,6 @@ const deletePic = (e) => {
// 上传图片
const afterRead = (e) => {
- console.log('选择的文件', e)
const type = e.file[0].type
if (!type.includes('image')) {
uni.$u.toast('请上传图片格式')
@@ -124,8 +123,6 @@ const afterRead = (e) => {
success: (res) => {
const data = JSON.parse(res.data)
- console.log(data, '上传结果')
-
if (data.code === 200) {
fileIds.value.push(data.data)
fileList.value.push({ ...e.file[0], id: data.data })
@@ -141,7 +138,6 @@ const afterRead = (e) => {
// 打开确认出场提示弹框
const openConfirmExitModal = () => {
- console.log('fileList', fileList.value)
if (fileList.value.length === 0 && exitParams.value.isShanghai == 0) {
uni.$u.toast('请上传离场工资结算确认单')
return
diff --git a/src/pages/select-project/index.vue b/src/pages/select-project/index.vue
index 869fb28..18f4576 100644
--- a/src/pages/select-project/index.vue
+++ b/src/pages/select-project/index.vue
@@ -1,6 +1,6 @@
-
+
选择工程
@@ -27,14 +27,13 @@
-
+
diff --git a/src/pages/shProjectDetails/index.vue b/src/pages/shProjectDetails/index.vue
new file mode 100644
index 0000000..4bca945
--- /dev/null
+++ b/src/pages/shProjectDetails/index.vue
@@ -0,0 +1,210 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 工种
+ {{ item.postName }}
+
+
+ 联系方式
+ {{ item.phone }}
+
+
+
+
+ 身份证
+ {{ item.idNumber }}
+
+
+ 所属工程
+ {{ item.proName }}
+
+
+ 所属分包
+ {{ item.subName }}
+
+
+ 所属班组
+ {{ item.teamName }}
+
+
+ 入场时间
+ {{ item.einTime }}
+
+
+
+
+ {{ !hasMore ? '没有更多数据了~' : '正在加载...' }}
+
+
+
+
+
+
+
+
diff --git a/src/services/shProjectSetting.js b/src/services/shProjectSetting.js
new file mode 100644
index 0000000..0abf163
--- /dev/null
+++ b/src/services/shProjectSetting.js
@@ -0,0 +1,19 @@
+import { http } from '@/utils/http'
+
+// 根据身份证查询该人员是否已经存在上海内工程
+export const getShProjectSettingByIdNumberAPI = (data) => {
+ return http({
+ method: 'POSt',
+ url: `/bmw/worker/selectByIdNumber/${data.idNumber}`,
+ data,
+ })
+}
+
+// 根据人员ID获取上海工程列表
+export const getShProjectListByWorkerIdAPI = (data) => {
+ return http({
+ method: 'GET',
+ url: `/bmw/worker/einListByWorkerId`,
+ data,
+ })
+}
diff --git a/src/static/image/person/pro_setting.png b/src/static/image/person/pro_setting.png
new file mode 100644
index 0000000000000000000000000000000000000000..1a3ba13db3f2640839fc6c9d112503caa7878627
GIT binary patch
literal 4790
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