|
|
9313c59d15
|
Squashed commit of the following:
commit c6612d254b
Merge: 26ee39e f4d737e
Author: 闵 年泽 <627844378@qq.com>
Date: Fri Jan 17 16:37:10 2025 +0800
Merge branch 'ldeyun' into 'master'
Ldeyun
See merge request cxcxt/cxc-szcx-uniapp!6
commit f4d737e827
Merge: 90584ed 26ee39e
Author: 闵 年泽 <627844378@qq.com>
Date: Fri Jan 17 16:36:27 2025 +0800
Merge remote-tracking branch 'remotes/origin/master' into ldeyun
# Conflicts:
# .env.development
# .gitignore
# api/renyuan.js
# bpm/leaveApplication/index.vue
# package-lock.json
# package.json
# pages.json
# pages/views/renliziyuan/renyuanxinxi/index.vue
# pages/views/renliziyuan/renyuanxinxi/taizhang.vue
# uni_modules/trq-depart-select/components/trq-depart-select/trq-depart-select.vue
commit 90584edaf9
Author: 闵 年泽 <627844378@qq.com>
Date: Fri Jan 17 16:29:01 2025 +0800
Squashed commit of the following:
commit 26ee39e9e0
Author: yangzhq68909 <993367776@qq.com>
Date: Fri Jan 17 13:48:45 2025 +0800
首页值班跳转路径
commit 0eb5fa4f51
Author: yangzhq68909 <993367776@qq.com>
Date: Mon Jan 13 08:44:08 2025 +0800
修改流程节点开始结束中文
commit d11c9c13f2
Merge: 5be34bd f5e9d1e
Author: yangzhq68909 <993367776@qq.com>
Date: Mon Jan 13 08:38:33 2025 +0800
Merge remote-tracking branch 'remotes/origin/master' into yzqUniapp
# Conflicts:
# .gitignore
# App.vue
# bpm/leaveApplication/index.vue
# bpm/supervise.vue
# pages.json
# uni_modules/uni-data-picker/changelog.md
# uni_modules/uni-data-picker/components/uni-data-picker/uni-data-picker.uvue
# uni_modules/uni-data-picker/components/uni-data-picker/uni-data-picker.vue
# uni_modules/uni-data-picker/components/uni-data-pickerview/uni-data-picker.uts
# uni_modules/uni-data-picker/package.json
# uni_modules/uni-datetime-picker/changelog.md
# uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar-item.vue
# uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar.vue
# uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker.vue
# uni_modules/uni-datetime-picker/components/uni-datetime-picker/util.js
# uni_modules/uni-datetime-picker/package.json
# uni_modules/uni-load-more/changelog.md
# uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue
# uni_modules/uni-load-more/package.json
# uni_modules/uni-popup/changelog.md
# uni_modules/uni-popup/components/uni-popup-share/uni-popup-share.vue
# uni_modules/uni-popup/components/uni-popup/uni-popup.vue
# uni_modules/uni-popup/package.json
commit 5be34bd578
Author: yangzhq68909 <993367776@qq.com>
Date: Mon Jan 13 08:24:57 2025 +0800
将流程信息开始结束节点改成中文
commit f5e9d1e611
Author: ldeyun <ldeyun@163.com>
Date: Sun Jan 12 18:49:20 2025 +0800
添加uni-modules组件，departSelect
commit 23e4f9f409
Author: yangzhq68909 <993367776@qq.com>
Date: Tue Jan 7 09:44:59 2025 +0800
1
commit a472d67520
Author: yangzhq68909 <993367776@qq.com>
Date: Mon Jan 6 10:44:29 2025 +0800
请假有效日期范围限制
commit 6054db8315
Author: yangzhq68909 <993367776@qq.com>
Date: Mon Dec 16 11:40:20 2024 +0800
1
commit 157249f2c6
Merge: ed007cb 20ba06b
Author: yangzhq68909 <993367776@qq.com>
Date: Fri Dec 6 09:03:09 2024 +0800
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
commit ed007cbaf6
Author: yangzhq68909 <993367776@qq.com>
Date: Fri Dec 6 09:00:15 2024 +0800
请假获取部门修改
commit 20ba06b4f1
Merge: fe7a52c af4b1b6
Author: jiang <358254771@qq.com>
Date: Wed Dec 4 17:04:09 2024 +0800
Merge branch 'master' of 10.75.166.171:cxcxt/cxc-szcx-uniapp
commit fe7a52cfef
Author: jiang <358254771@qq.com>
Date: Wed Dec 4 17:00:37 2024 +0800
忽略打包文件
commit 3794abbafc
Author: jiang <358254771@qq.com>
Date: Wed Dec 4 16:52:44 2024 +0800
和
commit af4b1b6c0a
Merge: 1ca340b ecc98b1
Author: 闵 年泽 <627844378@qq.com>
Date: Wed Dec 4 15:37:30 2024 +0800
Merge branch 'minUniapp' into 'master'
Min uniapp
See merge request cxcxt/cxc-szcx-uniapp!2
commit ecc98b14a2
Author: mnz <627844378@qq.com>
Date: Wed Dec 4 11:10:13 2024 +0800
修改h5
commit 4c1f42de56
Author: mnz <627844378@qq.com>
Date: Wed Dec 4 11:05:49 2024 +0800
1.修改app h5
commit c9ad71fe35
Author: jiang <358254771@qq.com>
Date: Tue Dec 3 14:08:45 2024 +0800
发布
commit ba291f2d61
Author: yangzhq68909 <993367776@qq.com>
Date: Tue Dec 3 10:52:17 2024 +0800
denglu
commit 1ca340b23c
Merge: 27c1637 c1a1127
Author: jiang wen <358254771@qq.com>
Date: Tue Nov 26 08:45:17 2024 +0800
Merge branch 'yzqUniapp' into 'master'
Yzq uniapp
See merge request cxcxt/cxc-szcx-uniapp!1
commit 0e7e8f3a8d
Author: yangzhq68909 <993367776@qq.com>
Date: Tue Nov 26 08:39:05 2024 +0800
忽略unpackage文件，jiang
commit a252f9b88b
Author: yangzhq68909 <993367776@qq.com>
Date: Tue Nov 12 16:16:01 2024 +0800
修改请假页面
commit b2664417e3
Author: yangzhq68909 <993367776@qq.com>
Date: Tue Nov 12 14:42:02 2024 +0800
1
commit c1a112754c
Author: yangzhq68909 <993367776@qq.com>
Date: Fri Nov 8 14:17:40 2024 +0800
1
commit ccfa6e4f11
Author: yangzhq68909 <993367776@qq.com>
Date: Thu Oct 31 16:38:07 2024 +0800
页面修改
commit f27c6e4ef0
Author: yangzhq68909 <993367776@qq.com>
Date: Tue Oct 29 15:34:31 2024 +0800
1
commit ba4d6ac0dd
Author: yangzhq68909 <993367776@qq.com>
Date: Tue Oct 29 08:23:20 2024 +0800
1
commit 6308621789
Author: yangzhq68909 <993367776@qq.com>
Date: Fri Oct 25 11:26:14 2024 +0800
1
commit 4bf243f42b
Author: yangzhq68909 <993367776@qq.com>
Date: Fri Oct 25 11:02:31 2024 +0800
增加流程取回、流程作废功能
commit 60e6f2bd2f
Author: yangzhq68909 <993367776@qq.com>
Date: Thu Oct 24 11:15:16 2024 +0800
流程签收功能 取消组任务
commit 72e1f6c02f
Author: yangzhq68909 <993367776@qq.com>
Date: Tue Oct 15 08:38:47 2024 +0800
1
commit e88ce332ed
Author: yangzhq68909 <993367776@qq.com>
Date: Mon Oct 14 15:46:55 2024 +0800
1
commit 1e857671cb
Author: yangzhq68909 <993367776@qq.com>
Date: Mon Oct 14 15:22:41 2024 +0800
上传附件及回显
commit 6202ab0f4c
Author: yangzhq68909 <993367776@qq.com>
Date: Mon Oct 14 08:51:28 2024 +0800
1
commit e73c24ff15
Author: yangzhq68909 <993367776@qq.com>
Date: Sat Oct 12 09:14:27 2024 +0800
11
commit 646c801665
Author: yangzhq68909 <993367776@qq.com>
Date: Sat Oct 12 08:53:10 2024 +0800
1
commit 767c647d4a
Author: yangzhq68909 <993367776@qq.com>
Date: Thu Oct 10 16:52:10 2024 +0800
1
commit 9a9e8327f6
Author: yangzhq68909 <993367776@qq.com>
Date: Thu Oct 10 15:32:42 2024 +0800
1
commit c3eb02f522
Author: yangzhq68909 <993367776@qq.com>
Date: Sun Sep 29 10:44:16 2024 +0800
icon修改 修改头像接口修改
commit 33666985b6
Author: yangzhq68909 <993367776@qq.com>
Date: Fri Sep 27 11:03:07 2024 +0800
1
commit 8809cc1975
Author: yangzhq68909 <993367776@qq.com>
Date: Thu Sep 26 12:06:47 2024 +0800
本地登录页面 请假类型选择
commit f9432900bd
Author: yangzhq68909 <993367776@qq.com>
Date: Tue Sep 24 17:23:37 2024 +0800
1
commit c9a320ddfd
Author: yangzhq68909 <993367776@qq.com>
Date: Tue Sep 24 17:21:34 2024 +0800
请假流程2.0
commit e7bcd4328d
Author: yangzhq68909 <993367776@qq.com>
Date: Thu Sep 19 16:13:33 2024 +0800
修改接口
commit 267ba082f0
Author: yangzhq68909 <993367776@qq.com>
Date: Thu Sep 19 15:12:58 2024 +0800
修改api接口路径
commit 27c163736d
Author: jiang <358254771@qq.com>
Date: Sat Sep 14 10:26:50 2024 +0800
数智产销APP第一版。
commit 14d9997160
Author: jiang wen <358254771@qq.com>
Date: Sat Sep 14 10:24:54 2024 +0800
Update README.md
# Conflicts:
# .env.development
# .gitignore
# api/renyuan.js
# bpm/leaveApplication/index.vue
# package-lock.json
# package.json
# pages.json
# pages/tab/index.vue
# pages/views/renliziyuan/renyuanxinxi/index.vue
# pages/views/renliziyuan/renyuanxinxi/taizhang.vue
# uni_modules/trq-depart-select/components/trq-depart-select/trq-depart-select.vue
commit 42adfc83d0
Author: ldeyun <ldeyun@163.com>
Date: Mon Jan 13 10:49:20 2025 +0800
人员统计图表页面
commit 26ee39e9e0
Author: yangzhq68909 <993367776@qq.com>
Date: Fri Jan 17 13:48:45 2025 +0800
首页值班跳转路径
commit 0eb5fa4f51
Author: yangzhq68909 <993367776@qq.com>
Date: Mon Jan 13 08:44:08 2025 +0800
修改流程节点开始结束中文
commit d11c9c13f2
Merge: 5be34bd f5e9d1e
Author: yangzhq68909 <993367776@qq.com>
Date: Mon Jan 13 08:38:33 2025 +0800
Merge remote-tracking branch 'remotes/origin/master' into yzqUniapp
# Conflicts:
# .gitignore
# App.vue
# bpm/leaveApplication/index.vue
# bpm/supervise.vue
# pages.json
# uni_modules/uni-data-picker/changelog.md
# uni_modules/uni-data-picker/components/uni-data-picker/uni-data-picker.uvue
# uni_modules/uni-data-picker/components/uni-data-picker/uni-data-picker.vue
# uni_modules/uni-data-picker/components/uni-data-pickerview/uni-data-picker.uts
# uni_modules/uni-data-picker/package.json
# uni_modules/uni-datetime-picker/changelog.md
# uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar-item.vue
# uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar.vue
# uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker.vue
# uni_modules/uni-datetime-picker/components/uni-datetime-picker/util.js
# uni_modules/uni-datetime-picker/package.json
# uni_modules/uni-load-more/changelog.md
# uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue
# uni_modules/uni-load-more/package.json
# uni_modules/uni-popup/changelog.md
# uni_modules/uni-popup/components/uni-popup-share/uni-popup-share.vue
# uni_modules/uni-popup/components/uni-popup/uni-popup.vue
# uni_modules/uni-popup/package.json
commit 5be34bd578
Author: yangzhq68909 <993367776@qq.com>
Date: Mon Jan 13 08:24:57 2025 +0800
将流程信息开始结束节点改成中文
commit 23e4f9f409
Author: yangzhq68909 <993367776@qq.com>
Date: Tue Jan 7 09:44:59 2025 +0800
1
commit a472d67520
Author: yangzhq68909 <993367776@qq.com>
Date: Mon Jan 6 10:44:29 2025 +0800
请假有效日期范围限制
commit 6054db8315
Author: yangzhq68909 <993367776@qq.com>
Date: Mon Dec 16 11:40:20 2024 +0800
1
commit 157249f2c6
Merge: ed007cb 20ba06b
Author: yangzhq68909 <993367776@qq.com>
Date: Fri Dec 6 09:03:09 2024 +0800
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
commit ed007cbaf6
Author: yangzhq68909 <993367776@qq.com>
Date: Fri Dec 6 09:00:15 2024 +0800
请假获取部门修改
commit 20ba06b4f1
Merge: fe7a52c af4b1b6
Author: jiang <358254771@qq.com>
Date: Wed Dec 4 17:04:09 2024 +0800
Merge branch 'master' of 10.75.166.171:cxcxt/cxc-szcx-uniapp
commit fe7a52cfef
Author: jiang <358254771@qq.com>
Date: Wed Dec 4 17:00:37 2024 +0800
忽略打包文件
commit 3794abbafc
Author: jiang <358254771@qq.com>
Date: Wed Dec 4 16:52:44 2024 +0800
和
commit af4b1b6c0a
Merge: 1ca340b ecc98b1
Author: 闵 年泽 <627844378@qq.com>
Date: Wed Dec 4 15:37:30 2024 +0800
Merge branch 'minUniapp' into 'master'
Min uniapp
See merge request cxcxt/cxc-szcx-uniapp!2
commit ecc98b14a2
Author: mnz <627844378@qq.com>
Date: Wed Dec 4 11:10:13 2024 +0800
修改h5
commit 4c1f42de56
Author: mnz <627844378@qq.com>
Date: Wed Dec 4 11:05:49 2024 +0800
1.修改app h5
commit c9ad71fe35
Author: jiang <358254771@qq.com>
Date: Tue Dec 3 14:08:45 2024 +0800
发布
commit ba291f2d61
Author: yangzhq68909 <993367776@qq.com>
Date: Tue Dec 3 10:52:17 2024 +0800
denglu
commit 1ca340b23c
Merge: 27c1637 c1a1127
Author: jiang wen <358254771@qq.com>
Date: Tue Nov 26 08:45:17 2024 +0800
Merge branch 'yzqUniapp' into 'master'
Yzq uniapp
See merge request cxcxt/cxc-szcx-uniapp!1
commit 0e7e8f3a8d
Author: yangzhq68909 <993367776@qq.com>
Date: Tue Nov 26 08:39:05 2024 +0800
忽略unpackage文件，jiang
commit a252f9b88b
Author: yangzhq68909 <993367776@qq.com>
Date: Tue Nov 12 16:16:01 2024 +0800
修改请假页面
commit b2664417e3
Author: yangzhq68909 <993367776@qq.com>
Date: Tue Nov 12 14:42:02 2024 +0800
1
commit c1a112754c
Author: yangzhq68909 <993367776@qq.com>
Date: Fri Nov 8 14:17:40 2024 +0800
1
commit ccfa6e4f11
Author: yangzhq68909 <993367776@qq.com>
Date: Thu Oct 31 16:38:07 2024 +0800
页面修改
commit f27c6e4ef0
Author: yangzhq68909 <993367776@qq.com>
Date: Tue Oct 29 15:34:31 2024 +0800
1
commit ba4d6ac0dd
Author: yangzhq68909 <993367776@qq.com>
Date: Tue Oct 29 08:23:20 2024 +0800
1
commit 6308621789
Author: yangzhq68909 <993367776@qq.com>
Date: Fri Oct 25 11:26:14 2024 +0800
1
commit 4bf243f42b
Author: yangzhq68909 <993367776@qq.com>
Date: Fri Oct 25 11:02:31 2024 +0800
增加流程取回、流程作废功能
commit 60e6f2bd2f
Author: yangzhq68909 <993367776@qq.com>
Date: Thu Oct 24 11:15:16 2024 +0800
流程签收功能 取消组任务
commit 72e1f6c02f
Author: yangzhq68909 <993367776@qq.com>
Date: Tue Oct 15 08:38:47 2024 +0800
1
commit e88ce332ed
Author: yangzhq68909 <993367776@qq.com>
Date: Mon Oct 14 15:46:55 2024 +0800
1
commit 1e857671cb
Author: yangzhq68909 <993367776@qq.com>
Date: Mon Oct 14 15:22:41 2024 +0800
上传附件及回显
commit 6202ab0f4c
Author: yangzhq68909 <993367776@qq.com>
Date: Mon Oct 14 08:51:28 2024 +0800
1
commit e73c24ff15
Author: yangzhq68909 <993367776@qq.com>
Date: Sat Oct 12 09:14:27 2024 +0800
11
commit 646c801665
Author: yangzhq68909 <993367776@qq.com>
Date: Sat Oct 12 08:53:10 2024 +0800
1
commit 767c647d4a
Author: yangzhq68909 <993367776@qq.com>
Date: Thu Oct 10 16:52:10 2024 +0800
1
commit 9a9e8327f6
Author: yangzhq68909 <993367776@qq.com>
Date: Thu Oct 10 15:32:42 2024 +0800
1
commit c3eb02f522
Author: yangzhq68909 <993367776@qq.com>
Date: Sun Sep 29 10:44:16 2024 +0800
icon修改 修改头像接口修改
commit 33666985b6
Author: yangzhq68909 <993367776@qq.com>
Date: Fri Sep 27 11:03:07 2024 +0800
1
commit 8809cc1975
Author: yangzhq68909 <993367776@qq.com>
Date: Thu Sep 26 12:06:47 2024 +0800
本地登录页面 请假类型选择
commit f9432900bd
Author: yangzhq68909 <993367776@qq.com>
Date: Tue Sep 24 17:23:37 2024 +0800
1
commit c9a320ddfd
Author: yangzhq68909 <993367776@qq.com>
Date: Tue Sep 24 17:21:34 2024 +0800
请假流程2.0
commit e7bcd4328d
Author: yangzhq68909 <993367776@qq.com>
Date: Thu Sep 19 16:13:33 2024 +0800
修改接口
commit 267ba082f0
Author: yangzhq68909 <993367776@qq.com>
Date: Thu Sep 19 15:12:58 2024 +0800
修改api接口路径
commit 27c163736d
Author: jiang <358254771@qq.com>
Date: Sat Sep 14 10:26:50 2024 +0800
数智产销APP第一版。
commit 14d9997160
Author: jiang wen <358254771@qq.com>
Date: Sat Sep 14 10:24:54 2024 +0800
Update README.md
|
2025-01-21 14:13:49 +08:00 |
|
闵 年泽
