yangzhq68909
|
157249f2c6
|
Merge remote-tracking branch 'remotes/origin/master' into yzqUniapp
# Conflicts:
# .env.development
# .gitignore
# manifest.json
# pages/login/login.vue
# unpackage/cache/apk/apkurl
# unpackage/cache/apk/cmManifestCache.json
# unpackage/cache/wgt/__UNI__9F097F0/pages/leave/application.css
# unpackage/cache/wgt/__UNI__9F097F0/pages/tab/index.css
# unpackage/cache/wgt/__UNI__F0AFD30/app-service.js
# unpackage/cache/wgt/__UNI__F0AFD30/manifest.json
# unpackage/dist/build/app-plus/app-service.js
# unpackage/dist/build/app-plus/manifest.json
# unpackage/dist/build/app-plus/pages/leave/application.css
# unpackage/dist/build/app-plus/pages/login/login.css
# unpackage/dist/build/app-plus/pages/tab/index.css
# unpackage/dist/build/app-plus/pages/useredit/useredit.css
# unpackage/dist/cache/.vite/deps/_metadata.json
# unpackage/dist/cache/.vite/deps/base-64.js
# unpackage/dist/cache/.vite/deps/base-64.js.map
# unpackage/dist/dev/app-plus/app-service.js
# unpackage/dist/dev/app-plus/manifest.json
|
2024-12-06 09:03:09 +08:00 |
|
yangzhq68909
|
ed007cbaf6
|
请假获取部门修改
|
2024-12-06 09:00:15 +08:00 |
|
jiang
|
20ba06b4f1
|
Merge branch 'master' of 10.75.166.171:cxcxt/cxc-szcx-uniapp
|
2024-12-04 17:04:09 +08:00 |
|
jiang
|
fe7a52cfef
|
忽略打包文件
|
2024-12-04 17:00:37 +08:00 |
|
jiang
|
3794abbafc
|
和
|
2024-12-04 16:52:44 +08:00 |
|
闵 年泽
|
af4b1b6c0a
|
Merge branch 'minUniapp' into 'master'
Min uniapp
See merge request cxcxt/cxc-szcx-uniapp!2
|
2024-12-04 15:37:30 +08:00 |
|
mnz
|
ecc98b14a2
|
修改h5
|
2024-12-04 11:10:13 +08:00 |
|
mnz
|
4c1f42de56
|
1.修改app h5
|
2024-12-04 11:05:49 +08:00 |
|
jiang
|
c9ad71fe35
|
发布
|
2024-12-03 14:08:45 +08:00 |
|
yangzhq68909
|
ba291f2d61
|
denglu
|
2024-12-03 10:52:17 +08:00 |
|
jiang wen
|
1ca340b23c
|
Merge branch 'yzqUniapp' into 'master'
Yzq uniapp
See merge request cxcxt/cxc-szcx-uniapp!1
|
2024-11-26 08:45:17 +08:00 |
|
yangzhq68909
|
0e7e8f3a8d
|
忽略unpackage文件，jiang
|
2024-11-26 08:39:05 +08:00 |
|
yangzhq68909
|
a252f9b88b
|
修改请假页面
|
2024-11-12 16:16:01 +08:00 |
|
yangzhq68909
|
b2664417e3
|
1
|
2024-11-12 14:42:02 +08:00 |
|
yangzhq68909
|
c1a112754c
|
1
|
2024-11-08 14:17:40 +08:00 |
|
yangzhq68909
|
ccfa6e4f11
|
页面修改
|
2024-10-31 16:38:07 +08:00 |
|
yangzhq68909
|
f27c6e4ef0
|
1
|
2024-10-29 15:34:31 +08:00 |
|
yangzhq68909
|
ba4d6ac0dd
|
1
|
2024-10-29 08:23:20 +08:00 |
|
yangzhq68909
|
6308621789
|
1
|
2024-10-25 11:26:14 +08:00 |
|
yangzhq68909
|
4bf243f42b
|
增加流程取回、流程作废功能
|
2024-10-25 11:02:31 +08:00 |
|
yangzhq68909
|
60e6f2bd2f
|
流程签收功能 取消组任务
|
2024-10-24 11:15:16 +08:00 |
|
yangzhq68909
|
72e1f6c02f
|
1
|
2024-10-15 08:38:47 +08:00 |
|
yangzhq68909
|
e88ce332ed
|
1
|
2024-10-14 15:46:55 +08:00 |
|
yangzhq68909
|
1e857671cb
|
上传附件及回显
|
2024-10-14 15:22:41 +08:00 |
|
yangzhq68909
|
6202ab0f4c
|
1
|
2024-10-14 08:51:28 +08:00 |
|
yangzhq68909
|
e73c24ff15
|
11
|
2024-10-12 09:14:27 +08:00 |
|
yangzhq68909
|
646c801665
|
1
|
2024-10-12 08:53:10 +08:00 |
|
yangzhq68909
|
767c647d4a
|
1
|
2024-10-10 16:52:10 +08:00 |
|
yangzhq68909
|
9a9e8327f6
|
1
|
2024-10-10 15:32:42 +08:00 |
|
yangzhq68909
|
c3eb02f522
|
icon修改 修改头像接口修改
|
2024-09-29 10:44:16 +08:00 |
|
yangzhq68909
|
33666985b6
|
1
|
2024-09-27 11:03:07 +08:00 |
|
yangzhq68909
|
8809cc1975
|
本地登录页面 请假类型选择
|
2024-09-26 12:06:47 +08:00 |
|
yangzhq68909
|
f9432900bd
|
1
|
2024-09-24 17:23:37 +08:00 |
|
yangzhq68909
|
c9a320ddfd
|
请假流程2.0
|
2024-09-24 17:21:34 +08:00 |
|
yangzhq68909
|
e7bcd4328d
|
修改接口
|
2024-09-19 16:13:33 +08:00 |
|
yangzhq68909
|
267ba082f0
|
修改api接口路径
|
2024-09-19 15:12:58 +08:00 |
|
jiang
|
27c163736d
|
数智产销APP第一版。
|
2024-09-14 10:26:50 +08:00 |
|
jiang wen
|
14d9997160
|
Update README.md
|
2024-09-14 10:24:54 +08:00 |
|