yangzhq68909
|
56427dbb19
|
Merge remote-tracking branch 'remotes/origin/master'
# Conflicts:
# env/.env.development
|
2025-06-19 17:40:15 +08:00 |
|
yangzhq68909
|
2175a82f6c
|
1.流程审批页面增加考核实施、指标考核
|
2025-06-19 17:38:54 +08:00 |
|
闵 年泽
|
8d831a5503
|
Merge branch 'minJeecg' into 'master'
1.修改app机制
See merge request cxcxt/jeecguniapp!15
|
2025-06-17 17:35:28 +08:00 |
|
lagos
|
71b3470ca2
|
1.修改app机制
|
2025-06-17 17:34:45 +08:00 |
|
yangzhq68909
|
3801233bf0
|
Merge remote-tracking branch 'remotes/origin/master'
|
2025-06-16 16:17:45 +08:00 |
|
yangzhq68909
|
b535e5ad3c
|
修改判断是否有新版本方法
|
2025-06-16 16:17:33 +08:00 |
|
闵 年泽
|
c0c652e132
|
Merge branch 'minJeecg' into 'master'
1.修改模块
See merge request cxcxt/jeecguniapp!14
|
2025-06-16 11:36:06 +08:00 |
|
lagos
|
be8ca7445e
|
1.修改模块
|
2025-06-16 11:35:05 +08:00 |
|
yangzhq68909
|
b4b88b0cd7
|
2.0.2
|
2025-06-15 10:44:00 +08:00 |
|
yangzhq68909
|
c5d9e0c8b9
|
Merge remote-tracking branch 'remotes/origin/master'
# Conflicts:
# env/.env.development
# src/pages-process/components/DynamicLink.vue
# src/pages.json
# src/types/uni-pages.d.ts
|
2025-06-13 17:27:45 +08:00 |
|
yangzhq68909
|
dab30417bd
|
请假、干租车、公文发布
|
2025-06-13 16:27:09 +08:00 |
|
闵 年泽
|
fc18a672b0
|
Merge branch 'minJeecg' into 'master'
1.新增非常规模块
See merge request cxcxt/jeecguniapp!13
|
2025-06-12 12:35:19 +08:00 |
|
lagos
|
2d6bb85936
|
1.新增非常规模块
|
2025-06-12 12:34:30 +08:00 |
|
yangzhq68909
|
a6d16819e1
|
干租车审批页面
|
2025-06-09 16:04:21 +08:00 |
|
yangzhq68909
|
32360ce63a
|
Merge remote-tracking branch 'remotes/origin/master'
|
2025-06-09 11:26:10 +08:00 |
|
yangzhq68909
|
8645e1f1d6
|
1.请假领导干部不再选择审批/分管领导
|
2025-06-09 11:25:55 +08:00 |
|
jiang
|
8329b325c4
|
Merge branch 'master' of http://10.75.166.171/cxcxt/jeecguniapp
|
2025-06-09 09:09:30 +08:00 |
|
jiang
|
25cbc74830
|
实流检定，脱离登录。
|
2025-06-09 08:23:21 +08:00 |
|
yangzhq68909
|
1b31ccdf34
|
生产情况
|
2025-06-06 17:46:49 +08:00 |
|
yangzhq68909
|
f7adf50bb3
|
优化生产数据表格显示
|
2025-06-06 17:01:59 +08:00 |
|
yangzhq68909
|
87188cb3f9
|
修改历史数据路径
|
2025-06-05 17:48:08 +08:00 |
|
yangzhq68909
|
8a90f9e3ef
|
1
|
2025-06-04 17:59:00 +08:00 |
|
yangzhq68909
|
9bafcc9c28
|
Merge remote-tracking branch 'remotes/origin/master'
|
2025-06-04 17:17:56 +08:00 |
|
yangzhq68909
|
692434f249
|
2.0.0
|
2025-06-04 17:17:40 +08:00 |
|
闵 年泽
|
1ac32902f9
|
Merge branch 'minJeecg' into 'master'
Min jeecg
See merge request cxcxt/jeecguniapp!12
|
2025-06-04 11:22:36 +08:00 |
|
lagos
|
48fca7f96f
|
Merge remote-tracking branch 'remotes/origin/master' into minJeecg
# Conflicts:
# env/.env.development
# manifest.config.ts
# src/manifest.json
# src/pages/onlinePreview/detail.vue
|
2025-06-04 11:21:52 +08:00 |
|
lagos
|
e204aaa917
|
1.修改实时数据，实现秒级数据查询
2.解决单个文件预览时返回上一级没有跳过中间件的问题
|
2025-06-04 11:19:19 +08:00 |
|
yangzhq68909
|
d5a8ed1d31
|
1.修改背景图 2.修改文件显示样式
|
2025-06-04 10:49:30 +08:00 |
|
yangzhq68909
|
ff49b8df0e
|
修改工业库、kkfileview访问链接
|
2025-06-03 18:37:08 +08:00 |
|
yangzhq68909
|
967e5a7188
|
1
|
2025-06-03 17:16:04 +08:00 |
|
yangzhq68909
|
2654c81e70
|
Merge remote-tracking branch 'remotes/origin/master'
# Conflicts:
# env/.env.production
|
2025-06-03 17:15:43 +08:00 |
|
yangzhq68909
|
d5e6a4dd26
|
2.0.0 修复h5证书问题
|
2025-06-03 17:13:19 +08:00 |
|
闵 年泽
|
7848276b4d
|
Merge branch 'minJeecg' into 'master'
Min jeecg
See merge request cxcxt/jeecguniapp!11
|
2025-05-30 17:50:52 +08:00 |
|
lagos
|
0b0836a91b
|
Merge remote-tracking branch 'remotes/origin/master' into minJeecg
# Conflicts:
# src/pages/login/login.vue
|
2025-05-30 17:34:38 +08:00 |
|
lagos
|
f8106c9a68
|
1.修改模块
|
2025-05-30 17:34:09 +08:00 |
|
yangzhq68909
|
12a80014a0
|
1.登录页提示 2.流程图显示修改
|
2025-05-30 16:31:08 +08:00 |
|
yangzhq68909
|
55d27e7f90
|
2.0.0
|
2025-05-30 08:30:31 +08:00 |
|
yangzhq68909
|
88962d4dbd
|
1.修改水印 2.修改三册在线预览
|
2025-05-29 18:25:16 +08:00 |
|
yangzhq68909
|
23ff8c1d65
|
2.0.0
|
2025-05-29 10:11:21 +08:00 |
|
yangzhq68909
|
4cfa4e2af1
|
2.0
|
2025-05-29 10:07:09 +08:00 |
|
yangzhq68909
|
6f4b3386d9
|
Merge remote-tracking branch 'remotes/origin/master'
# Conflicts:
# src/api/process/index.ts
# src/pages-process/taskHandle.vue
|
2025-05-28 15:05:00 +08:00 |
|
yangzhq68909
|
77c86f3a8f
|
领导审批不同意后短信通知
|
2025-05-28 14:52:04 +08:00 |
|
闵 年泽
|
e609bdd5b5
|
Merge branch 'minJeecg' into 'master'
1.修改模块
See merge request cxcxt/jeecguniapp!10
|
2025-05-28 14:51:38 +08:00 |
|
lagos
|
83ec561bcb
|
1.修改模块
|
2025-05-28 14:51:02 +08:00 |
|
yangzhq68909
|
3cefc4add1
|
Merge remote-tracking branch 'remotes/origin/master'
# Conflicts:
# src/pages-process/components/taskDeal.vue
|
2025-05-27 18:13:30 +08:00 |
|
yangzhq68909
|
df5ed2843e
|
1
|
2025-05-27 18:12:30 +08:00 |
|
闵 年泽
|
b685f82d84
|
Merge branch 'minJeecg' into 'master'
1.修改流程
See merge request cxcxt/jeecguniapp!9
|
2025-05-27 18:12:03 +08:00 |
|
lagos
|
fcc9a07681
|
1.修改流程
|
2025-05-27 18:11:28 +08:00 |
|
闵 年泽
|
229d52db47
|
Merge branch 'minJeecg' into 'master'
Min jeecg
See merge request cxcxt/jeecguniapp!8
|
2025-05-27 17:32:53 +08:00 |
|
lagos
|
ca6c08b8c6
|
Merge remote-tracking branch 'remotes/origin/master' into minJeecg
# Conflicts:
# src/api/process/index.ts
|
2025-05-27 17:32:23 +08:00 |
|