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 0000000..1a3ba13
Binary files /dev/null and b/src/static/image/person/pro_setting.png differ