moleier
|
cd2eb21f66
|
Merge remote-tracking branch 'origin/dev-cjw' into bjxz-wz
# Conflicts:
# unpackage/cache/apk/__UNI__4AA4101_cm.apk
# unpackage/cache/apk/apkurl
# unpackage/cache/apk/cmManifestCache.json
# unpackage/cache/certdata
# unpackage/cache/wgt/__UNI__4AA4101/app-config-service.js
# unpackage/cache/wgt/__UNI__4AA4101/app-service.js
# unpackage/cache/wgt/__UNI__4AA4101/app-view.js
# unpackage/cache/wgt/__UNI__4AA4101/manifest.json
# unpackage/cache/wgt/__UNI__4AA4101/pages/projectEnd/laborManage/faceRecognition.js
# unpackage/cache/wgt/__UNI__4AA4101/pages/projectEnd/project/projectInfo2.js
# unpackage/dist/build/app-plus/app-config-service.js
# unpackage/dist/build/app-plus/app-service.js
# unpackage/dist/build/app-plus/app-view.js
# unpackage/dist/build/app-plus/manifest.json
# unpackage/dist/build/app-plus/pages/projectEnd/laborManage/faceRecognition.js
# unpackage/dist/build/app-plus/pages/projectEnd/project/projectInfo2.js
# unpackage/release/apk/__UNI__4AA4101__20240415200047.apk
|
2024-04-22 17:39:51 +08:00 |
|
moleier
|
5aea83d74a
|
修复禅道上的bug
|
2024-04-22 17:36:17 +08:00 |
|
moleier
|
0dc27fbf49
|
更新工作流
|
2024-04-21 22:57:15 +08:00 |
|
moleier
|
e1594b6262
|
Merge remote-tracking branch 'origin/yjl_dev' into bjxz-wz
|
2024-04-21 09:45:42 +08:00 |
|
moleier
|
0abcb8ef1d
|
工作流bug
|
2024-04-21 09:44:03 +08:00 |
|
kun
|
13ce4f5397
|
fix: BUG修改
|
2024-04-19 23:51:45 +08:00 |
|
kun
|
9e1b8c1ac7
|
Merge branch 'yjl_dev' into bjxz-dev
|
2024-04-18 19:54:55 +08:00 |
|
kun
|
7ffb259ce2
|
fix: BUG修改
|
2024-04-18 19:53:04 +08:00 |
|
moleier
|
0a23a58068
|
新增登录时选择部门，进入后可切换部门，发布流程走通
|
2024-04-18 16:47:31 +08:00 |
|
Vce
|
bb81ad294f
|
修改劳务管理中查询人员的身份证号部分显示为*号
|
2024-04-17 09:19:16 +08:00 |
|
Vce
|
182ba8e85c
|
合并分支
|
2024-04-17 09:03:25 +08:00 |
|
Vce
|
90d04de063
|
修改劳务人员显示
|
2024-04-17 08:58:58 +08:00 |
|
Vce
|
f4b0e5ec44
|
修改劳务管理计算bug
|
2024-04-17 00:44:17 +08:00 |
|
kun
|
796e84e236
|
fix: BUG修改
|
2024-04-16 14:05:08 +08:00 |
|
kun
|
528df283c6
|
fix: BUG修改
|
2024-04-15 17:23:33 +08:00 |
|
kun
|
1d50edf275
|
fix: 解决冲突并合并代码
|
2024-04-15 14:36:17 +08:00 |
|
Vce
|
f17c36e405
|
修改首页tab不显示bug
|
2024-04-15 09:53:37 +08:00 |
|
Vce
|
e1a107321f
|
fix: BUG修改
|
2024-04-14 22:53:26 +08:00 |
|
Vce
|
228f90f2b0
|
fix: 修改app更新Bug
|
2024-03-29 17:34:09 +08:00 |
|
kun
|
1376279bda
|
fix: BUG修改
|
2024-03-15 18:51:27 +08:00 |
|
kun
|
6da0e9d2bf
|
Merge branches 'yjl_dev' and 'dev-cjw' of http://139.9.66.234:18023/dhp/zhgdyunapp into dev-cjw
|
2024-03-13 17:25:02 +08:00 |
|
vce
|
06706dbd8c
|
Fix: 修复Bug
|
2024-03-07 10:27:11 +08:00 |
|
vce
|
cb31f6d770
|
fix: 修改bug
|
2024-03-05 19:43:21 +08:00 |
|
kun
|
f8fc9165f1
|
fix: BUG修改
|
2024-03-05 18:24:45 +08:00 |
|
kun
|
1a7eae17fb
|
fix: BUG修改
|
2024-03-05 16:53:50 +08:00 |
|
kun
|
32c15dc6e0
|
fix: BUG修改
|
2023-12-15 14:18:44 +08:00 |
|
cjp
|
545c6ebcac
|
fix: BUG修复
|
2023-12-15 11:34:44 +08:00 |
|
cjp
|
71596f0c79
|
fix: 提交APP代码
|
2023-12-15 09:27:23 +08:00 |
|
jxj_yjl
|
b51460ec9b
|
app进度管理模块开发完成
|
2023-11-04 09:23:47 +08:00 |
|
jxj_yjl
|
d18e999dba
|
app质量模块梳理
|
2023-10-30 14:07:43 +08:00 |
|
jxj_yjl
|
9cfe9b8610
|
企业新增区域搜索/安全管理/质量管理增加相机水印
|
2023-08-29 10:55:31 +08:00 |
|
jxj_yjl
|
d8dbcc71b7
|
app页面：巡检点功能修改等其他页面修复
|
2023-08-18 19:37:37 +08:00 |
|
jxj_yjl
|
d17247deb7
|
成润项目问题修复
|
2023-06-19 19:28:30 +08:00 |
|
jxj_yjl
|
76ecefbca6
|
App页面bug修复
|
2023-06-19 09:02:35 +08:00 |
|
jxj_yjl
|
18ff8601bf
|
三江集团app第三方统一登录调整
|
2023-05-04 15:33:11 +08:00 |
|
jxj_yjl
|
044263307b
|
中建五局-质量模块bug修复
|
2023-04-27 09:34:04 +08:00 |
|
jxj_yjl
|
6f2b4db18c
|
中建五局-质量管理模块-图纸点位
|
2023-04-25 15:15:02 +08:00 |
|
jxj_yjl
|
bb81a3c186
|
进度管理点击bug修复提交
|
2023-04-13 16:44:43 +08:00 |
|
yjl
|
6d11cac351
|
app代码提交
|
2023-04-03 15:52:01 +08:00 |
|
yjl
|
932fc3da11
|
中建四-进度管理模块-页面调整
|
2023-03-29 09:49:04 +08:00 |
|
yjl
|
607936b45f
|
中建四局-进度管理模块
|
2023-03-22 15:38:12 +08:00 |
|
yjl
|
b862a74075
|
app修改提交
|
2023-03-20 18:43:57 +08:00 |
|
yjl
|
fe2aaabf6c
|
修改 劳务管理-移动考勤-实时 时间显示
|
2023-03-15 11:51:14 +08:00 |
|
yjl
|
c767304ce2
|
隐患选项bug修复
|
2023-03-13 10:57:42 +08:00 |
|
yjl
|
8c9ca201e2
|
广西联通（巡检点-扫一扫bug修复）
|
2023-02-15 18:13:39 +08:00 |
|
yjl
|
ae47c20cbb
|
质量管理新增四个字段
|
2023-02-07 16:36:36 +08:00 |
|
yjl
|
c39aeb37ea
|
Merge branch 'yanyan_dev' of 10.0.0.60:dhp/zhgdyunapp into yjl_dev（拉取yanyan分支冲突解决）
|
2023-02-06 11:24:48 +08:00 |
|
yjl
|
ed275dc092
|
app历史修改提交
|
2023-02-06 11:14:16 +08:00 |
|
yjl
|
7377eca2ae
|
新增班前喊话
|
2023-02-06 11:06:54 +08:00 |
|
yjl
|
bfb98cd2aa
|
新增班前喊话
|
2022-12-09 14:54:25 +08:00 |
|