cxc-szcx-uniapp/pages/views/renliziyuan/renyuanxinxi/detail.vue

586 lines
13 KiB
Vue
Raw Normal View History

Squashed commit of the following: commit c6612d254bf22bd677afc3d15ac9175e48f03efa 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 f4d737e827a788e30e091ef3c5002179fa030761 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 90584edaf966c5ca58b02847f4afe443a1ad9551 Author: 闵 年泽 <627844378@qq.com> Date: Fri Jan 17 16:29:01 2025 +0800 Squashed commit of the following: commit 26ee39e9e038027ea7fa4c740b989b69380660c3 Author: yangzhq68909 <993367776@qq.com> Date: Fri Jan 17 13:48:45 2025 +0800 首页值班跳转路径 commit 0eb5fa4f51f6dfd535f24dc846e061c317cc346a Author: yangzhq68909 <993367776@qq.com> Date: Mon Jan 13 08:44:08 2025 +0800 修改流程节点开始结束中文 commit d11c9c13f21966d683108ea2e1fd723c31a40dcc 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 5be34bd5789536bbaabf0ada35dffe977b8673cd Author: yangzhq68909 <993367776@qq.com> Date: Mon Jan 13 08:24:57 2025 +0800 将流程信息开始结束节点改成中文 commit f5e9d1e611d95b5c987bd2bf104d04ae24e1b12c Author: ldeyun <ldeyun@163.com> Date: Sun Jan 12 18:49:20 2025 +0800 添加uni-modules组件,departSelect commit 23e4f9f409251fe756c192466cd1bd555c3875bd Author: yangzhq68909 <993367776@qq.com> Date: Tue Jan 7 09:44:59 2025 +0800 1 commit a472d67520f26c10b023bf1f9c79257be4140fe4 Author: yangzhq68909 <993367776@qq.com> Date: Mon Jan 6 10:44:29 2025 +0800 请假有效日期范围限制 commit 6054db8315ee657326f5201001c3c9f9c061862e Author: yangzhq68909 <993367776@qq.com> Date: Mon Dec 16 11:40:20 2024 +0800 1 commit 157249f2c660d084f386396134c578d8908fe580 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 ed007cbaf6262d77586034ad3d96698c5540edc9 Author: yangzhq68909 <993367776@qq.com> Date: Fri Dec 6 09:00:15 2024 +0800 请假获取部门修改 commit 20ba06b4f1bbfa66efc88c4e3d63cc894235e416 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 fe7a52cfeff72f37421e6ec81bca398e7da4aabb Author: jiang <358254771@qq.com> Date: Wed Dec 4 17:00:37 2024 +0800 忽略打包文件 commit 3794abbafc31c13ec6f7783e8cdd809a41010142 Author: jiang <358254771@qq.com> Date: Wed Dec 4 16:52:44 2024 +0800 和 commit af4b1b6c0ad3065172698e479fcd0b55f423d7d7 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 ecc98b14a2f6947f947ccb9aa87b48efe0358feb Author: mnz <627844378@qq.com> Date: Wed Dec 4 11:10:13 2024 +0800 修改h5 commit 4c1f42de565aff9837b246029659dae144a3bb11 Author: mnz <627844378@qq.com> Date: Wed Dec 4 11:05:49 2024 +0800 1.修改app h5 commit c9ad71fe35c51270b267ea16a04cdcb6856ba4af Author: jiang <358254771@qq.com> Date: Tue Dec 3 14:08:45 2024 +0800 发布 commit ba291f2d6116ef7843ce41642a87222edd03592c Author: yangzhq68909 <993367776@qq.com> Date: Tue Dec 3 10:52:17 2024 +0800 denglu commit 1ca340b23cc0016c947eb9b7bb83df06cfe39a89 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 0e7e8f3a8d879f5fe96fec535d55f30c4ec30aa2 Author: yangzhq68909 <993367776@qq.com> Date: Tue Nov 26 08:39:05 2024 +0800 忽略unpackage文件,jiang commit a252f9b88bd27abcdc826e21d0c2bcac28da25f3 Author: yangzhq68909 <993367776@qq.com> Date: Tue Nov 12 16:16:01 2024 +0800 修改请假页面 commit b2664417e3775d1deeb67daafea8afd09eba8ff2 Author: yangzhq68909 <993367776@qq.com> Date: Tue Nov 12 14:42:02 2024 +0800 1 commit c1a112754c83e8653d975eda26a6f0636b282188 Author: yangzhq68909 <993367776@qq.com> Date: Fri Nov 8 14:17:40 2024 +0800 1 commit ccfa6e4f11596aa270fe8ec49662c8ecb2c2623a Author: yangzhq68909 <993367776@qq.com> Date: Thu Oct 31 16:38:07 2024 +0800 页面修改 commit f27c6e4ef022d5d459cec4c54d228e4865686b7f Author: yangzhq68909 <993367776@qq.com> Date: Tue Oct 29 15:34:31 2024 +0800 1 commit ba4d6ac0dd9a7925430a7b1c2611dbb6534fdb53 Author: yangzhq68909 <993367776@qq.com> Date: Tue Oct 29 08:23:20 2024 +0800 1 commit 630862178914a9f3af717d8229701851884f5bac Author: yangzhq68909 <993367776@qq.com> Date: Fri Oct 25 11:26:14 2024 +0800 1 commit 4bf243f42b914d5294dce9e735ec950402720b85 Author: yangzhq68909 <993367776@qq.com> Date: Fri Oct 25 11:02:31 2024 +0800 增加流程取回、流程作废功能 commit 60e6f2bd2fc8d5c7bb3c9f9784b681d5958b2167 Author: yangzhq68909 <993367776@qq.com> Date: Thu Oct 24 11:15:16 2024 +0800 流程签收功能 取消组任务 commit 72e1f6c02fe70475b2136facb05a09f6f3ab85f7 Author: yangzhq68909 <993367776@qq.com> Date: Tue Oct 15 08:38:47 2024 +0800 1 commit e88ce332ed5cc070c9d5da0afb0b8ae0b86b4c31 Author: yangzhq68909 <993367776@qq.com> Date: Mon Oct 14 15:46:55 2024 +0800 1 commit 1e857671cbc8332f95ce19b2ec5db204ad5bcd58 Author: yangzhq68909 <993367776@qq.com> Date: Mon Oct 14 15:22:41 2024 +0800 上传附件及回显 commit 6202ab0f4c0658aaa0ae1c0a032ad00065462bcf Author: yangzhq68909 <993367776@qq.com> Date: Mon Oct 14 08:51:28 2024 +0800 1 commit e73c24ff153e28e4b516395bc65e2e9d67c89fa5 Author: yangzhq68909 <993367776@qq.com> Date: Sat Oct 12 09:14:27 2024 +0800 11 commit 646c8016654ad49194f30845987bb088d89a75ed Author: yangzhq68909 <993367776@qq.com> Date: Sat Oct 12 08:53:10 2024 +0800 1 commit 767c647d4a964633b842c73c317a62ae9b2f98ff Author: yangzhq68909 <993367776@qq.com> Date: Thu Oct 10 16:52:10 2024 +0800 1 commit 9a9e8327f6f977a3619d8be1961deb406e354f9c Author: yangzhq68909 <993367776@qq.com> Date: Thu Oct 10 15:32:42 2024 +0800 1 commit c3eb02f52242a91982698b9964ae6195d11be6f7 Author: yangzhq68909 <993367776@qq.com> Date: Sun Sep 29 10:44:16 2024 +0800 icon修改 修改头像接口修改 commit 33666985b65f9df3a20d171e4207ec8a0175c855 Author: yangzhq68909 <993367776@qq.com> Date: Fri Sep 27 11:03:07 2024 +0800 1 commit 8809cc1975b7b2593ac58d1b94812cf79efb4199 Author: yangzhq68909 <993367776@qq.com> Date: Thu Sep 26 12:06:47 2024 +0800 本地登录页面 请假类型选择 commit f9432900bd16a59bf09ead042d8feb5f2212ea73 Author: yangzhq68909 <993367776@qq.com> Date: Tue Sep 24 17:23:37 2024 +0800 1 commit c9a320ddfd27e30dced5b637cc38a1f9dfd26838 Author: yangzhq68909 <993367776@qq.com> Date: Tue Sep 24 17:21:34 2024 +0800 请假流程2.0 commit e7bcd4328d75946533ebea0dc279360f26ebcbc5 Author: yangzhq68909 <993367776@qq.com> Date: Thu Sep 19 16:13:33 2024 +0800 修改接口 commit 267ba082f0134a3355b87e8dc20b02d5354552f1 Author: yangzhq68909 <993367776@qq.com> Date: Thu Sep 19 15:12:58 2024 +0800 修改api接口路径 commit 27c163736de6d9323ccd48aabfec258e75486b34 Author: jiang <358254771@qq.com> Date: Sat Sep 14 10:26:50 2024 +0800 数智产销APP第一版。 commit 14d99971604d13b84f43b4bc7c69394c403dffe7 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 42adfc83d0b98c39aaeb31768a00b510dbea7f21 Author: ldeyun <ldeyun@163.com> Date: Mon Jan 13 10:49:20 2025 +0800 人员统计图表页面 commit 26ee39e9e038027ea7fa4c740b989b69380660c3 Author: yangzhq68909 <993367776@qq.com> Date: Fri Jan 17 13:48:45 2025 +0800 首页值班跳转路径 commit 0eb5fa4f51f6dfd535f24dc846e061c317cc346a Author: yangzhq68909 <993367776@qq.com> Date: Mon Jan 13 08:44:08 2025 +0800 修改流程节点开始结束中文 commit d11c9c13f21966d683108ea2e1fd723c31a40dcc 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 5be34bd5789536bbaabf0ada35dffe977b8673cd Author: yangzhq68909 <993367776@qq.com> Date: Mon Jan 13 08:24:57 2025 +0800 将流程信息开始结束节点改成中文 commit 23e4f9f409251fe756c192466cd1bd555c3875bd Author: yangzhq68909 <993367776@qq.com> Date: Tue Jan 7 09:44:59 2025 +0800 1 commit a472d67520f26c10b023bf1f9c79257be4140fe4 Author: yangzhq68909 <993367776@qq.com> Date: Mon Jan 6 10:44:29 2025 +0800 请假有效日期范围限制 commit 6054db8315ee657326f5201001c3c9f9c061862e Author: yangzhq68909 <993367776@qq.com> Date: Mon Dec 16 11:40:20 2024 +0800 1 commit 157249f2c660d084f386396134c578d8908fe580 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 ed007cbaf6262d77586034ad3d96698c5540edc9 Author: yangzhq68909 <993367776@qq.com> Date: Fri Dec 6 09:00:15 2024 +0800 请假获取部门修改 commit 20ba06b4f1bbfa66efc88c4e3d63cc894235e416 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 fe7a52cfeff72f37421e6ec81bca398e7da4aabb Author: jiang <358254771@qq.com> Date: Wed Dec 4 17:00:37 2024 +0800 忽略打包文件 commit 3794abbafc31c13ec6f7783e8cdd809a41010142 Author: jiang <358254771@qq.com> Date: Wed Dec 4 16:52:44 2024 +0800 和 commit af4b1b6c0ad3065172698e479fcd0b55f423d7d7 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 ecc98b14a2f6947f947ccb9aa87b48efe0358feb Author: mnz <627844378@qq.com> Date: Wed Dec 4 11:10:13 2024 +0800 修改h5 commit 4c1f42de565aff9837b246029659dae144a3bb11 Author: mnz <627844378@qq.com> Date: Wed Dec 4 11:05:49 2024 +0800 1.修改app h5 commit c9ad71fe35c51270b267ea16a04cdcb6856ba4af Author: jiang <358254771@qq.com> Date: Tue Dec 3 14:08:45 2024 +0800 发布 commit ba291f2d6116ef7843ce41642a87222edd03592c Author: yangzhq68909 <993367776@qq.com> Date: Tue Dec 3 10:52:17 2024 +0800 denglu commit 1ca340b23cc0016c947eb9b7bb83df06cfe39a89 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 0e7e8f3a8d879f5fe96fec535d55f30c4ec30aa2 Author: yangzhq68909 <993367776@qq.com> Date: Tue Nov 26 08:39:05 2024 +0800 忽略unpackage文件,jiang commit a252f9b88bd27abcdc826e21d0c2bcac28da25f3 Author: yangzhq68909 <993367776@qq.com> Date: Tue Nov 12 16:16:01 2024 +0800 修改请假页面 commit b2664417e3775d1deeb67daafea8afd09eba8ff2 Author: yangzhq68909 <993367776@qq.com> Date: Tue Nov 12 14:42:02 2024 +0800 1 commit c1a112754c83e8653d975eda26a6f0636b282188 Author: yangzhq68909 <993367776@qq.com> Date: Fri Nov 8 14:17:40 2024 +0800 1 commit ccfa6e4f11596aa270fe8ec49662c8ecb2c2623a Author: yangzhq68909 <993367776@qq.com> Date: Thu Oct 31 16:38:07 2024 +0800 页面修改 commit f27c6e4ef022d5d459cec4c54d228e4865686b7f Author: yangzhq68909 <993367776@qq.com> Date: Tue Oct 29 15:34:31 2024 +0800 1 commit ba4d6ac0dd9a7925430a7b1c2611dbb6534fdb53 Author: yangzhq68909 <993367776@qq.com> Date: Tue Oct 29 08:23:20 2024 +0800 1 commit 630862178914a9f3af717d8229701851884f5bac Author: yangzhq68909 <993367776@qq.com> Date: Fri Oct 25 11:26:14 2024 +0800 1 commit 4bf243f42b914d5294dce9e735ec950402720b85 Author: yangzhq68909 <993367776@qq.com> Date: Fri Oct 25 11:02:31 2024 +0800 增加流程取回、流程作废功能 commit 60e6f2bd2fc8d5c7bb3c9f9784b681d5958b2167 Author: yangzhq68909 <993367776@qq.com> Date: Thu Oct 24 11:15:16 2024 +0800 流程签收功能 取消组任务 commit 72e1f6c02fe70475b2136facb05a09f6f3ab85f7 Author: yangzhq68909 <993367776@qq.com> Date: Tue Oct 15 08:38:47 2024 +0800 1 commit e88ce332ed5cc070c9d5da0afb0b8ae0b86b4c31 Author: yangzhq68909 <993367776@qq.com> Date: Mon Oct 14 15:46:55 2024 +0800 1 commit 1e857671cbc8332f95ce19b2ec5db204ad5bcd58 Author: yangzhq68909 <993367776@qq.com> Date: Mon Oct 14 15:22:41 2024 +0800 上传附件及回显 commit 6202ab0f4c0658aaa0ae1c0a032ad00065462bcf Author: yangzhq68909 <993367776@qq.com> Date: Mon Oct 14 08:51:28 2024 +0800 1 commit e73c24ff153e28e4b516395bc65e2e9d67c89fa5 Author: yangzhq68909 <993367776@qq.com> Date: Sat Oct 12 09:14:27 2024 +0800 11 commit 646c8016654ad49194f30845987bb088d89a75ed Author: yangzhq68909 <993367776@qq.com> Date: Sat Oct 12 08:53:10 2024 +0800 1 commit 767c647d4a964633b842c73c317a62ae9b2f98ff Author: yangzhq68909 <993367776@qq.com> Date: Thu Oct 10 16:52:10 2024 +0800 1 commit 9a9e8327f6f977a3619d8be1961deb406e354f9c Author: yangzhq68909 <993367776@qq.com> Date: Thu Oct 10 15:32:42 2024 +0800 1 commit c3eb02f52242a91982698b9964ae6195d11be6f7 Author: yangzhq68909 <993367776@qq.com> Date: Sun Sep 29 10:44:16 2024 +0800 icon修改 修改头像接口修改 commit 33666985b65f9df3a20d171e4207ec8a0175c855 Author: yangzhq68909 <993367776@qq.com> Date: Fri Sep 27 11:03:07 2024 +0800 1 commit 8809cc1975b7b2593ac58d1b94812cf79efb4199 Author: yangzhq68909 <993367776@qq.com> Date: Thu Sep 26 12:06:47 2024 +0800 本地登录页面 请假类型选择 commit f9432900bd16a59bf09ead042d8feb5f2212ea73 Author: yangzhq68909 <993367776@qq.com> Date: Tue Sep 24 17:23:37 2024 +0800 1 commit c9a320ddfd27e30dced5b637cc38a1f9dfd26838 Author: yangzhq68909 <993367776@qq.com> Date: Tue Sep 24 17:21:34 2024 +0800 请假流程2.0 commit e7bcd4328d75946533ebea0dc279360f26ebcbc5 Author: yangzhq68909 <993367776@qq.com> Date: Thu Sep 19 16:13:33 2024 +0800 修改接口 commit 267ba082f0134a3355b87e8dc20b02d5354552f1 Author: yangzhq68909 <993367776@qq.com> Date: Thu Sep 19 15:12:58 2024 +0800 修改api接口路径 commit 27c163736de6d9323ccd48aabfec258e75486b34 Author: jiang <358254771@qq.com> Date: Sat Sep 14 10:26:50 2024 +0800 数智产销APP第一版。 commit 14d99971604d13b84f43b4bc7c69394c403dffe7 Author: jiang wen <358254771@qq.com> Date: Sat Sep 14 10:24:54 2024 +0800 Update README.md
2025-01-21 06:13:49 +00:00
<template>
<view>
<scroll-view :scroll-x="true" :scroll-y="true">
<view style="padding: 10px 10px 10px 10px;">
<uni-title title="基本信息" type="h1" color="blue"></uni-title>
<yjly-row-cell :cellData="cellData" :rowDataCount="3"></yjly-row-cell>
2025-01-22 14:29:32 +00:00
<uni-title title="年度绩效考核" type="h1" color="blue"></uni-title>
<uni-row>
<uni-col :span="4">
<view class="titleStyle">
序号
</view>
</uni-col>
<uni-col :span="10">
<view class="titleStyle">
绩效考核年份
</view>
</uni-col>
<uni-col :span="10">
<view class="titleStyle">
绩效考核成绩
</view>
</uni-col>
</uni-row>
<uni-row>
<view v-for="(item,index) in jxkhxxList">
<uni-col :span="4">
<view class="dataStyle">
{{index+1}}
</view>
</uni-col>
<uni-col :span="10">
<view class="dataStyle">
{{item.nf}}
</view>
</uni-col><uni-col :span="10">
<view class="dataStyle">
{{item.khcj+"---"+item.khcj_dictText}}
</view>
</uni-col>
</view>
</uni-row>
Squashed commit of the following: commit c6612d254bf22bd677afc3d15ac9175e48f03efa 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 f4d737e827a788e30e091ef3c5002179fa030761 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 90584edaf966c5ca58b02847f4afe443a1ad9551 Author: 闵 年泽 <627844378@qq.com> Date: Fri Jan 17 16:29:01 2025 +0800 Squashed commit of the following: commit 26ee39e9e038027ea7fa4c740b989b69380660c3 Author: yangzhq68909 <993367776@qq.com> Date: Fri Jan 17 13:48:45 2025 +0800 首页值班跳转路径 commit 0eb5fa4f51f6dfd535f24dc846e061c317cc346a Author: yangzhq68909 <993367776@qq.com> Date: Mon Jan 13 08:44:08 2025 +0800 修改流程节点开始结束中文 commit d11c9c13f21966d683108ea2e1fd723c31a40dcc 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 5be34bd5789536bbaabf0ada35dffe977b8673cd Author: yangzhq68909 <993367776@qq.com> Date: Mon Jan 13 08:24:57 2025 +0800 将流程信息开始结束节点改成中文 commit f5e9d1e611d95b5c987bd2bf104d04ae24e1b12c Author: ldeyun <ldeyun@163.com> Date: Sun Jan 12 18:49:20 2025 +0800 添加uni-modules组件,departSelect commit 23e4f9f409251fe756c192466cd1bd555c3875bd Author: yangzhq68909 <993367776@qq.com> Date: Tue Jan 7 09:44:59 2025 +0800 1 commit a472d67520f26c10b023bf1f9c79257be4140fe4 Author: yangzhq68909 <993367776@qq.com> Date: Mon Jan 6 10:44:29 2025 +0800 请假有效日期范围限制 commit 6054db8315ee657326f5201001c3c9f9c061862e Author: yangzhq68909 <993367776@qq.com> Date: Mon Dec 16 11:40:20 2024 +0800 1 commit 157249f2c660d084f386396134c578d8908fe580 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 ed007cbaf6262d77586034ad3d96698c5540edc9 Author: yangzhq68909 <993367776@qq.com> Date: Fri Dec 6 09:00:15 2024 +0800 请假获取部门修改 commit 20ba06b4f1bbfa66efc88c4e3d63cc894235e416 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 fe7a52cfeff72f37421e6ec81bca398e7da4aabb Author: jiang <358254771@qq.com> Date: Wed Dec 4 17:00:37 2024 +0800 忽略打包文件 commit 3794abbafc31c13ec6f7783e8cdd809a41010142 Author: jiang <358254771@qq.com> Date: Wed Dec 4 16:52:44 2024 +0800 和 commit af4b1b6c0ad3065172698e479fcd0b55f423d7d7 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 ecc98b14a2f6947f947ccb9aa87b48efe0358feb Author: mnz <627844378@qq.com> Date: Wed Dec 4 11:10:13 2024 +0800 修改h5 commit 4c1f42de565aff9837b246029659dae144a3bb11 Author: mnz <627844378@qq.com> Date: Wed Dec 4 11:05:49 2024 +0800 1.修改app h5 commit c9ad71fe35c51270b267ea16a04cdcb6856ba4af Author: jiang <358254771@qq.com> Date: Tue Dec 3 14:08:45 2024 +0800 发布 commit ba291f2d6116ef7843ce41642a87222edd03592c Author: yangzhq68909 <993367776@qq.com> Date: Tue Dec 3 10:52:17 2024 +0800 denglu commit 1ca340b23cc0016c947eb9b7bb83df06cfe39a89 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 0e7e8f3a8d879f5fe96fec535d55f30c4ec30aa2 Author: yangzhq68909 <993367776@qq.com> Date: Tue Nov 26 08:39:05 2024 +0800 忽略unpackage文件,jiang commit a252f9b88bd27abcdc826e21d0c2bcac28da25f3 Author: yangzhq68909 <993367776@qq.com> Date: Tue Nov 12 16:16:01 2024 +0800 修改请假页面 commit b2664417e3775d1deeb67daafea8afd09eba8ff2 Author: yangzhq68909 <993367776@qq.com> Date: Tue Nov 12 14:42:02 2024 +0800 1 commit c1a112754c83e8653d975eda26a6f0636b282188 Author: yangzhq68909 <993367776@qq.com> Date: Fri Nov 8 14:17:40 2024 +0800 1 commit ccfa6e4f11596aa270fe8ec49662c8ecb2c2623a Author: yangzhq68909 <993367776@qq.com> Date: Thu Oct 31 16:38:07 2024 +0800 页面修改 commit f27c6e4ef022d5d459cec4c54d228e4865686b7f Author: yangzhq68909 <993367776@qq.com> Date: Tue Oct 29 15:34:31 2024 +0800 1 commit ba4d6ac0dd9a7925430a7b1c2611dbb6534fdb53 Author: yangzhq68909 <993367776@qq.com> Date: Tue Oct 29 08:23:20 2024 +0800 1 commit 630862178914a9f3af717d8229701851884f5bac Author: yangzhq68909 <993367776@qq.com> Date: Fri Oct 25 11:26:14 2024 +0800 1 commit 4bf243f42b914d5294dce9e735ec950402720b85 Author: yangzhq68909 <993367776@qq.com> Date: Fri Oct 25 11:02:31 2024 +0800 增加流程取回、流程作废功能 commit 60e6f2bd2fc8d5c7bb3c9f9784b681d5958b2167 Author: yangzhq68909 <993367776@qq.com> Date: Thu Oct 24 11:15:16 2024 +0800 流程签收功能 取消组任务 commit 72e1f6c02fe70475b2136facb05a09f6f3ab85f7 Author: yangzhq68909 <993367776@qq.com> Date: Tue Oct 15 08:38:47 2024 +0800 1 commit e88ce332ed5cc070c9d5da0afb0b8ae0b86b4c31 Author: yangzhq68909 <993367776@qq.com> Date: Mon Oct 14 15:46:55 2024 +0800 1 commit 1e857671cbc8332f95ce19b2ec5db204ad5bcd58 Author: yangzhq68909 <993367776@qq.com> Date: Mon Oct 14 15:22:41 2024 +0800 上传附件及回显 commit 6202ab0f4c0658aaa0ae1c0a032ad00065462bcf Author: yangzhq68909 <993367776@qq.com> Date: Mon Oct 14 08:51:28 2024 +0800 1 commit e73c24ff153e28e4b516395bc65e2e9d67c89fa5 Author: yangzhq68909 <993367776@qq.com> Date: Sat Oct 12 09:14:27 2024 +0800 11 commit 646c8016654ad49194f30845987bb088d89a75ed Author: yangzhq68909 <993367776@qq.com> Date: Sat Oct 12 08:53:10 2024 +0800 1 commit 767c647d4a964633b842c73c317a62ae9b2f98ff Author: yangzhq68909 <993367776@qq.com> Date: Thu Oct 10 16:52:10 2024 +0800 1 commit 9a9e8327f6f977a3619d8be1961deb406e354f9c Author: yangzhq68909 <993367776@qq.com> Date: Thu Oct 10 15:32:42 2024 +0800 1 commit c3eb02f52242a91982698b9964ae6195d11be6f7 Author: yangzhq68909 <993367776@qq.com> Date: Sun Sep 29 10:44:16 2024 +0800 icon修改 修改头像接口修改 commit 33666985b65f9df3a20d171e4207ec8a0175c855 Author: yangzhq68909 <993367776@qq.com> Date: Fri Sep 27 11:03:07 2024 +0800 1 commit 8809cc1975b7b2593ac58d1b94812cf79efb4199 Author: yangzhq68909 <993367776@qq.com> Date: Thu Sep 26 12:06:47 2024 +0800 本地登录页面 请假类型选择 commit f9432900bd16a59bf09ead042d8feb5f2212ea73 Author: yangzhq68909 <993367776@qq.com> Date: Tue Sep 24 17:23:37 2024 +0800 1 commit c9a320ddfd27e30dced5b637cc38a1f9dfd26838 Author: yangzhq68909 <993367776@qq.com> Date: Tue Sep 24 17:21:34 2024 +0800 请假流程2.0 commit e7bcd4328d75946533ebea0dc279360f26ebcbc5 Author: yangzhq68909 <993367776@qq.com> Date: Thu Sep 19 16:13:33 2024 +0800 修改接口 commit 267ba082f0134a3355b87e8dc20b02d5354552f1 Author: yangzhq68909 <993367776@qq.com> Date: Thu Sep 19 15:12:58 2024 +0800 修改api接口路径 commit 27c163736de6d9323ccd48aabfec258e75486b34 Author: jiang <358254771@qq.com> Date: Sat Sep 14 10:26:50 2024 +0800 数智产销APP第一版。 commit 14d99971604d13b84f43b4bc7c69394c403dffe7 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 42adfc83d0b98c39aaeb31768a00b510dbea7f21 Author: ldeyun <ldeyun@163.com> Date: Mon Jan 13 10:49:20 2025 +0800 人员统计图表页面 commit 26ee39e9e038027ea7fa4c740b989b69380660c3 Author: yangzhq68909 <993367776@qq.com> Date: Fri Jan 17 13:48:45 2025 +0800 首页值班跳转路径 commit 0eb5fa4f51f6dfd535f24dc846e061c317cc346a Author: yangzhq68909 <993367776@qq.com> Date: Mon Jan 13 08:44:08 2025 +0800 修改流程节点开始结束中文 commit d11c9c13f21966d683108ea2e1fd723c31a40dcc 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 5be34bd5789536bbaabf0ada35dffe977b8673cd Author: yangzhq68909 <993367776@qq.com> Date: Mon Jan 13 08:24:57 2025 +0800 将流程信息开始结束节点改成中文 commit 23e4f9f409251fe756c192466cd1bd555c3875bd Author: yangzhq68909 <993367776@qq.com> Date: Tue Jan 7 09:44:59 2025 +0800 1 commit a472d67520f26c10b023bf1f9c79257be4140fe4 Author: yangzhq68909 <993367776@qq.com> Date: Mon Jan 6 10:44:29 2025 +0800 请假有效日期范围限制 commit 6054db8315ee657326f5201001c3c9f9c061862e Author: yangzhq68909 <993367776@qq.com> Date: Mon Dec 16 11:40:20 2024 +0800 1 commit 157249f2c660d084f386396134c578d8908fe580 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 ed007cbaf6262d77586034ad3d96698c5540edc9 Author: yangzhq68909 <993367776@qq.com> Date: Fri Dec 6 09:00:15 2024 +0800 请假获取部门修改 commit 20ba06b4f1bbfa66efc88c4e3d63cc894235e416 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 fe7a52cfeff72f37421e6ec81bca398e7da4aabb Author: jiang <358254771@qq.com> Date: Wed Dec 4 17:00:37 2024 +0800 忽略打包文件 commit 3794abbafc31c13ec6f7783e8cdd809a41010142 Author: jiang <358254771@qq.com> Date: Wed Dec 4 16:52:44 2024 +0800 和 commit af4b1b6c0ad3065172698e479fcd0b55f423d7d7 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 ecc98b14a2f6947f947ccb9aa87b48efe0358feb Author: mnz <627844378@qq.com> Date: Wed Dec 4 11:10:13 2024 +0800 修改h5 commit 4c1f42de565aff9837b246029659dae144a3bb11 Author: mnz <627844378@qq.com> Date: Wed Dec 4 11:05:49 2024 +0800 1.修改app h5 commit c9ad71fe35c51270b267ea16a04cdcb6856ba4af Author: jiang <358254771@qq.com> Date: Tue Dec 3 14:08:45 2024 +0800 发布 commit ba291f2d6116ef7843ce41642a87222edd03592c Author: yangzhq68909 <993367776@qq.com> Date: Tue Dec 3 10:52:17 2024 +0800 denglu commit 1ca340b23cc0016c947eb9b7bb83df06cfe39a89 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 0e7e8f3a8d879f5fe96fec535d55f30c4ec30aa2 Author: yangzhq68909 <993367776@qq.com> Date: Tue Nov 26 08:39:05 2024 +0800 忽略unpackage文件,jiang commit a252f9b88bd27abcdc826e21d0c2bcac28da25f3 Author: yangzhq68909 <993367776@qq.com> Date: Tue Nov 12 16:16:01 2024 +0800 修改请假页面 commit b2664417e3775d1deeb67daafea8afd09eba8ff2 Author: yangzhq68909 <993367776@qq.com> Date: Tue Nov 12 14:42:02 2024 +0800 1 commit c1a112754c83e8653d975eda26a6f0636b282188 Author: yangzhq68909 <993367776@qq.com> Date: Fri Nov 8 14:17:40 2024 +0800 1 commit ccfa6e4f11596aa270fe8ec49662c8ecb2c2623a Author: yangzhq68909 <993367776@qq.com> Date: Thu Oct 31 16:38:07 2024 +0800 页面修改 commit f27c6e4ef022d5d459cec4c54d228e4865686b7f Author: yangzhq68909 <993367776@qq.com> Date: Tue Oct 29 15:34:31 2024 +0800 1 commit ba4d6ac0dd9a7925430a7b1c2611dbb6534fdb53 Author: yangzhq68909 <993367776@qq.com> Date: Tue Oct 29 08:23:20 2024 +0800 1 commit 630862178914a9f3af717d8229701851884f5bac Author: yangzhq68909 <993367776@qq.com> Date: Fri Oct 25 11:26:14 2024 +0800 1 commit 4bf243f42b914d5294dce9e735ec950402720b85 Author: yangzhq68909 <993367776@qq.com> Date: Fri Oct 25 11:02:31 2024 +0800 增加流程取回、流程作废功能 commit 60e6f2bd2fc8d5c7bb3c9f9784b681d5958b2167 Author: yangzhq68909 <993367776@qq.com> Date: Thu Oct 24 11:15:16 2024 +0800 流程签收功能 取消组任务 commit 72e1f6c02fe70475b2136facb05a09f6f3ab85f7 Author: yangzhq68909 <993367776@qq.com> Date: Tue Oct 15 08:38:47 2024 +0800 1 commit e88ce332ed5cc070c9d5da0afb0b8ae0b86b4c31 Author: yangzhq68909 <993367776@qq.com> Date: Mon Oct 14 15:46:55 2024 +0800 1 commit 1e857671cbc8332f95ce19b2ec5db204ad5bcd58 Author: yangzhq68909 <993367776@qq.com> Date: Mon Oct 14 15:22:41 2024 +0800 上传附件及回显 commit 6202ab0f4c0658aaa0ae1c0a032ad00065462bcf Author: yangzhq68909 <993367776@qq.com> Date: Mon Oct 14 08:51:28 2024 +0800 1 commit e73c24ff153e28e4b516395bc65e2e9d67c89fa5 Author: yangzhq68909 <993367776@qq.com> Date: Sat Oct 12 09:14:27 2024 +0800 11 commit 646c8016654ad49194f30845987bb088d89a75ed Author: yangzhq68909 <993367776@qq.com> Date: Sat Oct 12 08:53:10 2024 +0800 1 commit 767c647d4a964633b842c73c317a62ae9b2f98ff Author: yangzhq68909 <993367776@qq.com> Date: Thu Oct 10 16:52:10 2024 +0800 1 commit 9a9e8327f6f977a3619d8be1961deb406e354f9c Author: yangzhq68909 <993367776@qq.com> Date: Thu Oct 10 15:32:42 2024 +0800 1 commit c3eb02f52242a91982698b9964ae6195d11be6f7 Author: yangzhq68909 <993367776@qq.com> Date: Sun Sep 29 10:44:16 2024 +0800 icon修改 修改头像接口修改 commit 33666985b65f9df3a20d171e4207ec8a0175c855 Author: yangzhq68909 <993367776@qq.com> Date: Fri Sep 27 11:03:07 2024 +0800 1 commit 8809cc1975b7b2593ac58d1b94812cf79efb4199 Author: yangzhq68909 <993367776@qq.com> Date: Thu Sep 26 12:06:47 2024 +0800 本地登录页面 请假类型选择 commit f9432900bd16a59bf09ead042d8feb5f2212ea73 Author: yangzhq68909 <993367776@qq.com> Date: Tue Sep 24 17:23:37 2024 +0800 1 commit c9a320ddfd27e30dced5b637cc38a1f9dfd26838 Author: yangzhq68909 <993367776@qq.com> Date: Tue Sep 24 17:21:34 2024 +0800 请假流程2.0 commit e7bcd4328d75946533ebea0dc279360f26ebcbc5 Author: yangzhq68909 <993367776@qq.com> Date: Thu Sep 19 16:13:33 2024 +0800 修改接口 commit 267ba082f0134a3355b87e8dc20b02d5354552f1 Author: yangzhq68909 <993367776@qq.com> Date: Thu Sep 19 15:12:58 2024 +0800 修改api接口路径 commit 27c163736de6d9323ccd48aabfec258e75486b34 Author: jiang <358254771@qq.com> Date: Sat Sep 14 10:26:50 2024 +0800 数智产销APP第一版。 commit 14d99971604d13b84f43b4bc7c69394c403dffe7 Author: jiang wen <358254771@qq.com> Date: Sat Sep 14 10:24:54 2024 +0800 Update README.md
2025-01-21 06:13:49 +00:00
<uni-title title="工作简历" type="h1" color="blue"></uni-title>
<uni-row>
<uni-col :span="4">
<view class="titleStyle">
起始时间
</view>
</uni-col>
<uni-col :span="4">
<view class="titleStyle">
终止时间
</view>
</uni-col>
<uni-col :span="11">
<view class="titleStyle">
工作职务
</view>
</uni-col>
<uni-col :span="5">
<view class="titleStyle">
岗位职务
</view>
</uni-col>
</uni-row>
<uni-row>
<view v-for="(item,index) in gzjlList">
<uni-col :span="4">
<view class="dataStyle">
{{item.kssj}}
</view>
</uni-col>
<uni-col :span="4">
<view class="dataStyle">
{{item.jssj}}
</view>
</uni-col><uni-col :span="11">
<view class="dataStyle">
{{item.jlms}}
</view>
</uni-col><uni-col :span="5">
<view class="dataStyle">
{{item.jlms2}}
</view>
</uni-col>
</view>
</uni-row>
<!-- <uni-segmented-control></uni-segmented-control> -->
<uni-title title="学历信息" type="h1" color="blue"></uni-title>
<uni-row>
<uni-col :span="4">
<view class="titleStyle">
类别
</view>
</uni-col>
<uni-col :span="4">
<view class="titleStyle">
毕业院校
</view>
</uni-col>
<uni-col :span="4">
<view class="titleStyle">
所学专业
</view>
</uni-col>
<uni-col :span="4">
<view class="titleStyle">
学历
</view>
</uni-col>
<uni-col :span="4">
<view class="titleStyle">
学位
</view>
</uni-col>
<uni-col :span="4">
<view class="titleStyle">
毕业时间
</view>
</uni-col>
</uni-row>
<uni-row>
<view v-for="(item,index) in xlxxList">
<uni-col :span="4">
<view class="dataStyle">
{{item.xllb}}
</view>
</uni-col>
<uni-col :span="4">
<view class="dataStyle">
{{item.byyx}}
</view>
</uni-col><uni-col :span="4">
<view class="dataStyle">
{{item.sxzy}}
</view>
</uni-col><uni-col :span="4">
<view class="dataStyle">
{{item.qdxl}}
</view>
</uni-col>
<uni-col :span="4">
<view class="dataStyle">
{{item.qdxw}}
</view>
</uni-col>
<uni-col :span="4">
<view class="dataStyle">
{{item.bytime}}
</view>
</uni-col>
</view>
</uni-row>
<uni-title title="取证信息" type="h1" color="blue"></uni-title>
<uni-row>
<uni-col :span="6">
<view class="titleStyle">
证书名称
</view>
</uni-col>
<uni-col :span="5">
<view class="titleStyle">
证书等级
</view>
</uni-col>
<uni-col :span="5">
<view class="titleStyle">
取证时间
</view>
</uni-col>
<uni-col :span="5">
<view class="titleStyle">
复审时间
</view>
</uni-col>
<uni-col :span="3">
<view class="titleStyle">
备注
</view>
</uni-col>
</uni-row>
<uni-row>
<view v-for="(item,index) in zjtzList">
<uni-col :span="6">
<view class="dataStyle">
{{item.zjmc}}
</view>
</uni-col>
<uni-col :span="5">
<view class="dataStyle">
{{item.zsdj}}
</view>
</uni-col><uni-col :span="5">
<view class="dataStyle">
{{item.fzrq}}
</view>
</uni-col><uni-col :span="5">
<view class="dataStyle">
{{item.fssj}}
</view>
</uni-col>
<uni-col :span="3">
<view class="dataStyle">
{{item.bz}}
</view>
</uni-col>
</view>
</uni-row>
<uni-title title="家庭信息" type="h1" color="blue"></uni-title>
<uni-row>
<uni-col :span="4">
<view class="titleStyle">
称谓
</view>
</uni-col>
<uni-col :span="3">
<view class="titleStyle">
姓名
</view>
</uni-col>
<uni-col :span="6">
<view class="titleStyle">
出生年月
</view>
</uni-col>
<uni-col :span="4">
<view class="titleStyle">
政治面貌
</view>
</uni-col>
<uni-col :span="7">
<view class="titleStyle">
工作单位及职务
</view>
</uni-col>
</uni-row>
<uni-row>
<view v-for="(item,index) in zyjtcyList">
<uni-col :span="4">
<view class="dataStyle">
{{item.ybrgx}}
</view>
</uni-col>
<uni-col :span="3">
<view class="dataStyle">
{{item.gxname}}
</view>
</uni-col><uni-col :span="6">
<view class="dataStyle">
{{item.cstime}}
</view>
</uni-col><uni-col :span="4">
<view class="dataStyle">
{{item.cyzzmm}}
</view>
</uni-col>
<uni-col :span="7">
<view class="dataStyle">
{{item.cygzdw}}
</view>
</uni-col>
</view>
</uni-row>
</view>
</scroll-view>
</view>
</template>
<script setup>
import {
onReady,
onLoad
} from '@dcloudio/uni-app';
import {
reactive,
ref,
onMounted
} from 'vue';
import {
queryGzjlByRyLdhth,
queryQzqkByRyLdhth,
queryJtzycyByRyLdhth,
queryXlxxByRyLdhth,
queryGbxxByRyLdhth,
2025-01-22 14:29:32 +00:00
queryZyzgdjByRyLdhth,
queryJxkhByRyLdhth
Squashed commit of the following: commit c6612d254bf22bd677afc3d15ac9175e48f03efa 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 f4d737e827a788e30e091ef3c5002179fa030761 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 90584edaf966c5ca58b02847f4afe443a1ad9551 Author: 闵 年泽 <627844378@qq.com> Date: Fri Jan 17 16:29:01 2025 +0800 Squashed commit of the following: commit 26ee39e9e038027ea7fa4c740b989b69380660c3 Author: yangzhq68909 <993367776@qq.com> Date: Fri Jan 17 13:48:45 2025 +0800 首页值班跳转路径 commit 0eb5fa4f51f6dfd535f24dc846e061c317cc346a Author: yangzhq68909 <993367776@qq.com> Date: Mon Jan 13 08:44:08 2025 +0800 修改流程节点开始结束中文 commit d11c9c13f21966d683108ea2e1fd723c31a40dcc 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 5be34bd5789536bbaabf0ada35dffe977b8673cd Author: yangzhq68909 <993367776@qq.com> Date: Mon Jan 13 08:24:57 2025 +0800 将流程信息开始结束节点改成中文 commit f5e9d1e611d95b5c987bd2bf104d04ae24e1b12c Author: ldeyun <ldeyun@163.com> Date: Sun Jan 12 18:49:20 2025 +0800 添加uni-modules组件,departSelect commit 23e4f9f409251fe756c192466cd1bd555c3875bd Author: yangzhq68909 <993367776@qq.com> Date: Tue Jan 7 09:44:59 2025 +0800 1 commit a472d67520f26c10b023bf1f9c79257be4140fe4 Author: yangzhq68909 <993367776@qq.com> Date: Mon Jan 6 10:44:29 2025 +0800 请假有效日期范围限制 commit 6054db8315ee657326f5201001c3c9f9c061862e Author: yangzhq68909 <993367776@qq.com> Date: Mon Dec 16 11:40:20 2024 +0800 1 commit 157249f2c660d084f386396134c578d8908fe580 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 ed007cbaf6262d77586034ad3d96698c5540edc9 Author: yangzhq68909 <993367776@qq.com> Date: Fri Dec 6 09:00:15 2024 +0800 请假获取部门修改 commit 20ba06b4f1bbfa66efc88c4e3d63cc894235e416 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 fe7a52cfeff72f37421e6ec81bca398e7da4aabb Author: jiang <358254771@qq.com> Date: Wed Dec 4 17:00:37 2024 +0800 忽略打包文件 commit 3794abbafc31c13ec6f7783e8cdd809a41010142 Author: jiang <358254771@qq.com> Date: Wed Dec 4 16:52:44 2024 +0800 和 commit af4b1b6c0ad3065172698e479fcd0b55f423d7d7 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 ecc98b14a2f6947f947ccb9aa87b48efe0358feb Author: mnz <627844378@qq.com> Date: Wed Dec 4 11:10:13 2024 +0800 修改h5 commit 4c1f42de565aff9837b246029659dae144a3bb11 Author: mnz <627844378@qq.com> Date: Wed Dec 4 11:05:49 2024 +0800 1.修改app h5 commit c9ad71fe35c51270b267ea16a04cdcb6856ba4af Author: jiang <358254771@qq.com> Date: Tue Dec 3 14:08:45 2024 +0800 发布 commit ba291f2d6116ef7843ce41642a87222edd03592c Author: yangzhq68909 <993367776@qq.com> Date: Tue Dec 3 10:52:17 2024 +0800 denglu commit 1ca340b23cc0016c947eb9b7bb83df06cfe39a89 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 0e7e8f3a8d879f5fe96fec535d55f30c4ec30aa2 Author: yangzhq68909 <993367776@qq.com> Date: Tue Nov 26 08:39:05 2024 +0800 忽略unpackage文件,jiang commit a252f9b88bd27abcdc826e21d0c2bcac28da25f3 Author: yangzhq68909 <993367776@qq.com> Date: Tue Nov 12 16:16:01 2024 +0800 修改请假页面 commit b2664417e3775d1deeb67daafea8afd09eba8ff2 Author: yangzhq68909 <993367776@qq.com> Date: Tue Nov 12 14:42:02 2024 +0800 1 commit c1a112754c83e8653d975eda26a6f0636b282188 Author: yangzhq68909 <993367776@qq.com> Date: Fri Nov 8 14:17:40 2024 +0800 1 commit ccfa6e4f11596aa270fe8ec49662c8ecb2c2623a Author: yangzhq68909 <993367776@qq.com> Date: Thu Oct 31 16:38:07 2024 +0800 页面修改 commit f27c6e4ef022d5d459cec4c54d228e4865686b7f Author: yangzhq68909 <993367776@qq.com> Date: Tue Oct 29 15:34:31 2024 +0800 1 commit ba4d6ac0dd9a7925430a7b1c2611dbb6534fdb53 Author: yangzhq68909 <993367776@qq.com> Date: Tue Oct 29 08:23:20 2024 +0800 1 commit 630862178914a9f3af717d8229701851884f5bac Author: yangzhq68909 <993367776@qq.com> Date: Fri Oct 25 11:26:14 2024 +0800 1 commit 4bf243f42b914d5294dce9e735ec950402720b85 Author: yangzhq68909 <993367776@qq.com> Date: Fri Oct 25 11:02:31 2024 +0800 增加流程取回、流程作废功能 commit 60e6f2bd2fc8d5c7bb3c9f9784b681d5958b2167 Author: yangzhq68909 <993367776@qq.com> Date: Thu Oct 24 11:15:16 2024 +0800 流程签收功能 取消组任务 commit 72e1f6c02fe70475b2136facb05a09f6f3ab85f7 Author: yangzhq68909 <993367776@qq.com> Date: Tue Oct 15 08:38:47 2024 +0800 1 commit e88ce332ed5cc070c9d5da0afb0b8ae0b86b4c31 Author: yangzhq68909 <993367776@qq.com> Date: Mon Oct 14 15:46:55 2024 +0800 1 commit 1e857671cbc8332f95ce19b2ec5db204ad5bcd58 Author: yangzhq68909 <993367776@qq.com> Date: Mon Oct 14 15:22:41 2024 +0800 上传附件及回显 commit 6202ab0f4c0658aaa0ae1c0a032ad00065462bcf Author: yangzhq68909 <993367776@qq.com> Date: Mon Oct 14 08:51:28 2024 +0800 1 commit e73c24ff153e28e4b516395bc65e2e9d67c89fa5 Author: yangzhq68909 <993367776@qq.com> Date: Sat Oct 12 09:14:27 2024 +0800 11 commit 646c8016654ad49194f30845987bb088d89a75ed Author: yangzhq68909 <993367776@qq.com> Date: Sat Oct 12 08:53:10 2024 +0800 1 commit 767c647d4a964633b842c73c317a62ae9b2f98ff Author: yangzhq68909 <993367776@qq.com> Date: Thu Oct 10 16:52:10 2024 +0800 1 commit 9a9e8327f6f977a3619d8be1961deb406e354f9c Author: yangzhq68909 <993367776@qq.com> Date: Thu Oct 10 15:32:42 2024 +0800 1 commit c3eb02f52242a91982698b9964ae6195d11be6f7 Author: yangzhq68909 <993367776@qq.com> Date: Sun Sep 29 10:44:16 2024 +0800 icon修改 修改头像接口修改 commit 33666985b65f9df3a20d171e4207ec8a0175c855 Author: yangzhq68909 <993367776@qq.com> Date: Fri Sep 27 11:03:07 2024 +0800 1 commit 8809cc1975b7b2593ac58d1b94812cf79efb4199 Author: yangzhq68909 <993367776@qq.com> Date: Thu Sep 26 12:06:47 2024 +0800 本地登录页面 请假类型选择 commit f9432900bd16a59bf09ead042d8feb5f2212ea73 Author: yangzhq68909 <993367776@qq.com> Date: Tue Sep 24 17:23:37 2024 +0800 1 commit c9a320ddfd27e30dced5b637cc38a1f9dfd26838 Author: yangzhq68909 <993367776@qq.com> Date: Tue Sep 24 17:21:34 2024 +0800 请假流程2.0 commit e7bcd4328d75946533ebea0dc279360f26ebcbc5 Author: yangzhq68909 <993367776@qq.com> Date: Thu Sep 19 16:13:33 2024 +0800 修改接口 commit 267ba082f0134a3355b87e8dc20b02d5354552f1 Author: yangzhq68909 <993367776@qq.com> Date: Thu Sep 19 15:12:58 2024 +0800 修改api接口路径 commit 27c163736de6d9323ccd48aabfec258e75486b34 Author: jiang <358254771@qq.com> Date: Sat Sep 14 10:26:50 2024 +0800 数智产销APP第一版。 commit 14d99971604d13b84f43b4bc7c69394c403dffe7 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 42adfc83d0b98c39aaeb31768a00b510dbea7f21 Author: ldeyun <ldeyun@163.com> Date: Mon Jan 13 10:49:20 2025 +0800 人员统计图表页面 commit 26ee39e9e038027ea7fa4c740b989b69380660c3 Author: yangzhq68909 <993367776@qq.com> Date: Fri Jan 17 13:48:45 2025 +0800 首页值班跳转路径 commit 0eb5fa4f51f6dfd535f24dc846e061c317cc346a Author: yangzhq68909 <993367776@qq.com> Date: Mon Jan 13 08:44:08 2025 +0800 修改流程节点开始结束中文 commit d11c9c13f21966d683108ea2e1fd723c31a40dcc 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 5be34bd5789536bbaabf0ada35dffe977b8673cd Author: yangzhq68909 <993367776@qq.com> Date: Mon Jan 13 08:24:57 2025 +0800 将流程信息开始结束节点改成中文 commit 23e4f9f409251fe756c192466cd1bd555c3875bd Author: yangzhq68909 <993367776@qq.com> Date: Tue Jan 7 09:44:59 2025 +0800 1 commit a472d67520f26c10b023bf1f9c79257be4140fe4 Author: yangzhq68909 <993367776@qq.com> Date: Mon Jan 6 10:44:29 2025 +0800 请假有效日期范围限制 commit 6054db8315ee657326f5201001c3c9f9c061862e Author: yangzhq68909 <993367776@qq.com> Date: Mon Dec 16 11:40:20 2024 +0800 1 commit 157249f2c660d084f386396134c578d8908fe580 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 ed007cbaf6262d77586034ad3d96698c5540edc9 Author: yangzhq68909 <993367776@qq.com> Date: Fri Dec 6 09:00:15 2024 +0800 请假获取部门修改 commit 20ba06b4f1bbfa66efc88c4e3d63cc894235e416 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 fe7a52cfeff72f37421e6ec81bca398e7da4aabb Author: jiang <358254771@qq.com> Date: Wed Dec 4 17:00:37 2024 +0800 忽略打包文件 commit 3794abbafc31c13ec6f7783e8cdd809a41010142 Author: jiang <358254771@qq.com> Date: Wed Dec 4 16:52:44 2024 +0800 和 commit af4b1b6c0ad3065172698e479fcd0b55f423d7d7 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 ecc98b14a2f6947f947ccb9aa87b48efe0358feb Author: mnz <627844378@qq.com> Date: Wed Dec 4 11:10:13 2024 +0800 修改h5 commit 4c1f42de565aff9837b246029659dae144a3bb11 Author: mnz <627844378@qq.com> Date: Wed Dec 4 11:05:49 2024 +0800 1.修改app h5 commit c9ad71fe35c51270b267ea16a04cdcb6856ba4af Author: jiang <358254771@qq.com> Date: Tue Dec 3 14:08:45 2024 +0800 发布 commit ba291f2d6116ef7843ce41642a87222edd03592c Author: yangzhq68909 <993367776@qq.com> Date: Tue Dec 3 10:52:17 2024 +0800 denglu commit 1ca340b23cc0016c947eb9b7bb83df06cfe39a89 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 0e7e8f3a8d879f5fe96fec535d55f30c4ec30aa2 Author: yangzhq68909 <993367776@qq.com> Date: Tue Nov 26 08:39:05 2024 +0800 忽略unpackage文件,jiang commit a252f9b88bd27abcdc826e21d0c2bcac28da25f3 Author: yangzhq68909 <993367776@qq.com> Date: Tue Nov 12 16:16:01 2024 +0800 修改请假页面 commit b2664417e3775d1deeb67daafea8afd09eba8ff2 Author: yangzhq68909 <993367776@qq.com> Date: Tue Nov 12 14:42:02 2024 +0800 1 commit c1a112754c83e8653d975eda26a6f0636b282188 Author: yangzhq68909 <993367776@qq.com> Date: Fri Nov 8 14:17:40 2024 +0800 1 commit ccfa6e4f11596aa270fe8ec49662c8ecb2c2623a Author: yangzhq68909 <993367776@qq.com> Date: Thu Oct 31 16:38:07 2024 +0800 页面修改 commit f27c6e4ef022d5d459cec4c54d228e4865686b7f Author: yangzhq68909 <993367776@qq.com> Date: Tue Oct 29 15:34:31 2024 +0800 1 commit ba4d6ac0dd9a7925430a7b1c2611dbb6534fdb53 Author: yangzhq68909 <993367776@qq.com> Date: Tue Oct 29 08:23:20 2024 +0800 1 commit 630862178914a9f3af717d8229701851884f5bac Author: yangzhq68909 <993367776@qq.com> Date: Fri Oct 25 11:26:14 2024 +0800 1 commit 4bf243f42b914d5294dce9e735ec950402720b85 Author: yangzhq68909 <993367776@qq.com> Date: Fri Oct 25 11:02:31 2024 +0800 增加流程取回、流程作废功能 commit 60e6f2bd2fc8d5c7bb3c9f9784b681d5958b2167 Author: yangzhq68909 <993367776@qq.com> Date: Thu Oct 24 11:15:16 2024 +0800 流程签收功能 取消组任务 commit 72e1f6c02fe70475b2136facb05a09f6f3ab85f7 Author: yangzhq68909 <993367776@qq.com> Date: Tue Oct 15 08:38:47 2024 +0800 1 commit e88ce332ed5cc070c9d5da0afb0b8ae0b86b4c31 Author: yangzhq68909 <993367776@qq.com> Date: Mon Oct 14 15:46:55 2024 +0800 1 commit 1e857671cbc8332f95ce19b2ec5db204ad5bcd58 Author: yangzhq68909 <993367776@qq.com> Date: Mon Oct 14 15:22:41 2024 +0800 上传附件及回显 commit 6202ab0f4c0658aaa0ae1c0a032ad00065462bcf Author: yangzhq68909 <993367776@qq.com> Date: Mon Oct 14 08:51:28 2024 +0800 1 commit e73c24ff153e28e4b516395bc65e2e9d67c89fa5 Author: yangzhq68909 <993367776@qq.com> Date: Sat Oct 12 09:14:27 2024 +0800 11 commit 646c8016654ad49194f30845987bb088d89a75ed Author: yangzhq68909 <993367776@qq.com> Date: Sat Oct 12 08:53:10 2024 +0800 1 commit 767c647d4a964633b842c73c317a62ae9b2f98ff Author: yangzhq68909 <993367776@qq.com> Date: Thu Oct 10 16:52:10 2024 +0800 1 commit 9a9e8327f6f977a3619d8be1961deb406e354f9c Author: yangzhq68909 <993367776@qq.com> Date: Thu Oct 10 15:32:42 2024 +0800 1 commit c3eb02f52242a91982698b9964ae6195d11be6f7 Author: yangzhq68909 <993367776@qq.com> Date: Sun Sep 29 10:44:16 2024 +0800 icon修改 修改头像接口修改 commit 33666985b65f9df3a20d171e4207ec8a0175c855 Author: yangzhq68909 <993367776@qq.com> Date: Fri Sep 27 11:03:07 2024 +0800 1 commit 8809cc1975b7b2593ac58d1b94812cf79efb4199 Author: yangzhq68909 <993367776@qq.com> Date: Thu Sep 26 12:06:47 2024 +0800 本地登录页面 请假类型选择 commit f9432900bd16a59bf09ead042d8feb5f2212ea73 Author: yangzhq68909 <993367776@qq.com> Date: Tue Sep 24 17:23:37 2024 +0800 1 commit c9a320ddfd27e30dced5b637cc38a1f9dfd26838 Author: yangzhq68909 <993367776@qq.com> Date: Tue Sep 24 17:21:34 2024 +0800 请假流程2.0 commit e7bcd4328d75946533ebea0dc279360f26ebcbc5 Author: yangzhq68909 <993367776@qq.com> Date: Thu Sep 19 16:13:33 2024 +0800 修改接口 commit 267ba082f0134a3355b87e8dc20b02d5354552f1 Author: yangzhq68909 <993367776@qq.com> Date: Thu Sep 19 15:12:58 2024 +0800 修改api接口路径 commit 27c163736de6d9323ccd48aabfec258e75486b34 Author: jiang <358254771@qq.com> Date: Sat Sep 14 10:26:50 2024 +0800 数智产销APP第一版。 commit 14d99971604d13b84f43b4bc7c69394c403dffe7 Author: jiang wen <358254771@qq.com> Date: Sat Sep 14 10:24:54 2024 +0800 Update README.md
2025-01-21 06:13:49 +00:00
} from '@/api/renyuan.js'
import {
useStore
} from '@/store';
const tempCellData = ref({
"title": "",
"value": "",
"titleSpan": 4,
"valueSpan": 4
})
const ldhth = ref("")
const renyuanData = ref({})
const cellData = ref([])
const gzjlList = ref([]) // 人员其他子表信息-工作经历
const zjtzList = ref([]) // 人员其他子表信息-证件台账
const zyjtcyList = ref([]) // 人员其他子表信息-主要家庭成员
const xlxxList = ref([]) // 人员其他子表信息-学历证书
const gbxxList = ref([]) // 人员其他子表信息-干部信息
const zyzgdjList = ref([]) // 人员其他子表信息-职业资格等级
2025-01-22 14:29:32 +00:00
const jxkhxxList = ref([]) // 人员其他子表信息-绩效考核信息
Squashed commit of the following: commit c6612d254bf22bd677afc3d15ac9175e48f03efa 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 f4d737e827a788e30e091ef3c5002179fa030761 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 90584edaf966c5ca58b02847f4afe443a1ad9551 Author: 闵 年泽 <627844378@qq.com> Date: Fri Jan 17 16:29:01 2025 +0800 Squashed commit of the following: commit 26ee39e9e038027ea7fa4c740b989b69380660c3 Author: yangzhq68909 <993367776@qq.com> Date: Fri Jan 17 13:48:45 2025 +0800 首页值班跳转路径 commit 0eb5fa4f51f6dfd535f24dc846e061c317cc346a Author: yangzhq68909 <993367776@qq.com> Date: Mon Jan 13 08:44:08 2025 +0800 修改流程节点开始结束中文 commit d11c9c13f21966d683108ea2e1fd723c31a40dcc 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 5be34bd5789536bbaabf0ada35dffe977b8673cd Author: yangzhq68909 <993367776@qq.com> Date: Mon Jan 13 08:24:57 2025 +0800 将流程信息开始结束节点改成中文 commit f5e9d1e611d95b5c987bd2bf104d04ae24e1b12c Author: ldeyun <ldeyun@163.com> Date: Sun Jan 12 18:49:20 2025 +0800 添加uni-modules组件,departSelect commit 23e4f9f409251fe756c192466cd1bd555c3875bd Author: yangzhq68909 <993367776@qq.com> Date: Tue Jan 7 09:44:59 2025 +0800 1 commit a472d67520f26c10b023bf1f9c79257be4140fe4 Author: yangzhq68909 <993367776@qq.com> Date: Mon Jan 6 10:44:29 2025 +0800 请假有效日期范围限制 commit 6054db8315ee657326f5201001c3c9f9c061862e Author: yangzhq68909 <993367776@qq.com> Date: Mon Dec 16 11:40:20 2024 +0800 1 commit 157249f2c660d084f386396134c578d8908fe580 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 ed007cbaf6262d77586034ad3d96698c5540edc9 Author: yangzhq68909 <993367776@qq.com> Date: Fri Dec 6 09:00:15 2024 +0800 请假获取部门修改 commit 20ba06b4f1bbfa66efc88c4e3d63cc894235e416 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 fe7a52cfeff72f37421e6ec81bca398e7da4aabb Author: jiang <358254771@qq.com> Date: Wed Dec 4 17:00:37 2024 +0800 忽略打包文件 commit 3794abbafc31c13ec6f7783e8cdd809a41010142 Author: jiang <358254771@qq.com> Date: Wed Dec 4 16:52:44 2024 +0800 和 commit af4b1b6c0ad3065172698e479fcd0b55f423d7d7 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 ecc98b14a2f6947f947ccb9aa87b48efe0358feb Author: mnz <627844378@qq.com> Date: Wed Dec 4 11:10:13 2024 +0800 修改h5 commit 4c1f42de565aff9837b246029659dae144a3bb11 Author: mnz <627844378@qq.com> Date: Wed Dec 4 11:05:49 2024 +0800 1.修改app h5 commit c9ad71fe35c51270b267ea16a04cdcb6856ba4af Author: jiang <358254771@qq.com> Date: Tue Dec 3 14:08:45 2024 +0800 发布 commit ba291f2d6116ef7843ce41642a87222edd03592c Author: yangzhq68909 <993367776@qq.com> Date: Tue Dec 3 10:52:17 2024 +0800 denglu commit 1ca340b23cc0016c947eb9b7bb83df06cfe39a89 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 0e7e8f3a8d879f5fe96fec535d55f30c4ec30aa2 Author: yangzhq68909 <993367776@qq.com> Date: Tue Nov 26 08:39:05 2024 +0800 忽略unpackage文件,jiang commit a252f9b88bd27abcdc826e21d0c2bcac28da25f3 Author: yangzhq68909 <993367776@qq.com> Date: Tue Nov 12 16:16:01 2024 +0800 修改请假页面 commit b2664417e3775d1deeb67daafea8afd09eba8ff2 Author: yangzhq68909 <993367776@qq.com> Date: Tue Nov 12 14:42:02 2024 +0800 1 commit c1a112754c83e8653d975eda26a6f0636b282188 Author: yangzhq68909 <993367776@qq.com> Date: Fri Nov 8 14:17:40 2024 +0800 1 commit ccfa6e4f11596aa270fe8ec49662c8ecb2c2623a Author: yangzhq68909 <993367776@qq.com> Date: Thu Oct 31 16:38:07 2024 +0800 页面修改 commit f27c6e4ef022d5d459cec4c54d228e4865686b7f Author: yangzhq68909 <993367776@qq.com> Date: Tue Oct 29 15:34:31 2024 +0800 1 commit ba4d6ac0dd9a7925430a7b1c2611dbb6534fdb53 Author: yangzhq68909 <993367776@qq.com> Date: Tue Oct 29 08:23:20 2024 +0800 1 commit 630862178914a9f3af717d8229701851884f5bac Author: yangzhq68909 <993367776@qq.com> Date: Fri Oct 25 11:26:14 2024 +0800 1 commit 4bf243f42b914d5294dce9e735ec950402720b85 Author: yangzhq68909 <993367776@qq.com> Date: Fri Oct 25 11:02:31 2024 +0800 增加流程取回、流程作废功能 commit 60e6f2bd2fc8d5c7bb3c9f9784b681d5958b2167 Author: yangzhq68909 <993367776@qq.com> Date: Thu Oct 24 11:15:16 2024 +0800 流程签收功能 取消组任务 commit 72e1f6c02fe70475b2136facb05a09f6f3ab85f7 Author: yangzhq68909 <993367776@qq.com> Date: Tue Oct 15 08:38:47 2024 +0800 1 commit e88ce332ed5cc070c9d5da0afb0b8ae0b86b4c31 Author: yangzhq68909 <993367776@qq.com> Date: Mon Oct 14 15:46:55 2024 +0800 1 commit 1e857671cbc8332f95ce19b2ec5db204ad5bcd58 Author: yangzhq68909 <993367776@qq.com> Date: Mon Oct 14 15:22:41 2024 +0800 上传附件及回显 commit 6202ab0f4c0658aaa0ae1c0a032ad00065462bcf Author: yangzhq68909 <993367776@qq.com> Date: Mon Oct 14 08:51:28 2024 +0800 1 commit e73c24ff153e28e4b516395bc65e2e9d67c89fa5 Author: yangzhq68909 <993367776@qq.com> Date: Sat Oct 12 09:14:27 2024 +0800 11 commit 646c8016654ad49194f30845987bb088d89a75ed Author: yangzhq68909 <993367776@qq.com> Date: Sat Oct 12 08:53:10 2024 +0800 1 commit 767c647d4a964633b842c73c317a62ae9b2f98ff Author: yangzhq68909 <993367776@qq.com> Date: Thu Oct 10 16:52:10 2024 +0800 1 commit 9a9e8327f6f977a3619d8be1961deb406e354f9c Author: yangzhq68909 <993367776@qq.com> Date: Thu Oct 10 15:32:42 2024 +0800 1 commit c3eb02f52242a91982698b9964ae6195d11be6f7 Author: yangzhq68909 <993367776@qq.com> Date: Sun Sep 29 10:44:16 2024 +0800 icon修改 修改头像接口修改 commit 33666985b65f9df3a20d171e4207ec8a0175c855 Author: yangzhq68909 <993367776@qq.com> Date: Fri Sep 27 11:03:07 2024 +0800 1 commit 8809cc1975b7b2593ac58d1b94812cf79efb4199 Author: yangzhq68909 <993367776@qq.com> Date: Thu Sep 26 12:06:47 2024 +0800 本地登录页面 请假类型选择 commit f9432900bd16a59bf09ead042d8feb5f2212ea73 Author: yangzhq68909 <993367776@qq.com> Date: Tue Sep 24 17:23:37 2024 +0800 1 commit c9a320ddfd27e30dced5b637cc38a1f9dfd26838 Author: yangzhq68909 <993367776@qq.com> Date: Tue Sep 24 17:21:34 2024 +0800 请假流程2.0 commit e7bcd4328d75946533ebea0dc279360f26ebcbc5 Author: yangzhq68909 <993367776@qq.com> Date: Thu Sep 19 16:13:33 2024 +0800 修改接口 commit 267ba082f0134a3355b87e8dc20b02d5354552f1 Author: yangzhq68909 <993367776@qq.com> Date: Thu Sep 19 15:12:58 2024 +0800 修改api接口路径 commit 27c163736de6d9323ccd48aabfec258e75486b34 Author: jiang <358254771@qq.com> Date: Sat Sep 14 10:26:50 2024 +0800 数智产销APP第一版。 commit 14d99971604d13b84f43b4bc7c69394c403dffe7 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 42adfc83d0b98c39aaeb31768a00b510dbea7f21 Author: ldeyun <ldeyun@163.com> Date: Mon Jan 13 10:49:20 2025 +0800 人员统计图表页面 commit 26ee39e9e038027ea7fa4c740b989b69380660c3 Author: yangzhq68909 <993367776@qq.com> Date: Fri Jan 17 13:48:45 2025 +0800 首页值班跳转路径 commit 0eb5fa4f51f6dfd535f24dc846e061c317cc346a Author: yangzhq68909 <993367776@qq.com> Date: Mon Jan 13 08:44:08 2025 +0800 修改流程节点开始结束中文 commit d11c9c13f21966d683108ea2e1fd723c31a40dcc 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 5be34bd5789536bbaabf0ada35dffe977b8673cd Author: yangzhq68909 <993367776@qq.com> Date: Mon Jan 13 08:24:57 2025 +0800 将流程信息开始结束节点改成中文 commit 23e4f9f409251fe756c192466cd1bd555c3875bd Author: yangzhq68909 <993367776@qq.com> Date: Tue Jan 7 09:44:59 2025 +0800 1 commit a472d67520f26c10b023bf1f9c79257be4140fe4 Author: yangzhq68909 <993367776@qq.com> Date: Mon Jan 6 10:44:29 2025 +0800 请假有效日期范围限制 commit 6054db8315ee657326f5201001c3c9f9c061862e Author: yangzhq68909 <993367776@qq.com> Date: Mon Dec 16 11:40:20 2024 +0800 1 commit 157249f2c660d084f386396134c578d8908fe580 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 ed007cbaf6262d77586034ad3d96698c5540edc9 Author: yangzhq68909 <993367776@qq.com> Date: Fri Dec 6 09:00:15 2024 +0800 请假获取部门修改 commit 20ba06b4f1bbfa66efc88c4e3d63cc894235e416 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 fe7a52cfeff72f37421e6ec81bca398e7da4aabb Author: jiang <358254771@qq.com> Date: Wed Dec 4 17:00:37 2024 +0800 忽略打包文件 commit 3794abbafc31c13ec6f7783e8cdd809a41010142 Author: jiang <358254771@qq.com> Date: Wed Dec 4 16:52:44 2024 +0800 和 commit af4b1b6c0ad3065172698e479fcd0b55f423d7d7 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 ecc98b14a2f6947f947ccb9aa87b48efe0358feb Author: mnz <627844378@qq.com> Date: Wed Dec 4 11:10:13 2024 +0800 修改h5 commit 4c1f42de565aff9837b246029659dae144a3bb11 Author: mnz <627844378@qq.com> Date: Wed Dec 4 11:05:49 2024 +0800 1.修改app h5 commit c9ad71fe35c51270b267ea16a04cdcb6856ba4af Author: jiang <358254771@qq.com> Date: Tue Dec 3 14:08:45 2024 +0800 发布 commit ba291f2d6116ef7843ce41642a87222edd03592c Author: yangzhq68909 <993367776@qq.com> Date: Tue Dec 3 10:52:17 2024 +0800 denglu commit 1ca340b23cc0016c947eb9b7bb83df06cfe39a89 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 0e7e8f3a8d879f5fe96fec535d55f30c4ec30aa2 Author: yangzhq68909 <993367776@qq.com> Date: Tue Nov 26 08:39:05 2024 +0800 忽略unpackage文件,jiang commit a252f9b88bd27abcdc826e21d0c2bcac28da25f3 Author: yangzhq68909 <993367776@qq.com> Date: Tue Nov 12 16:16:01 2024 +0800 修改请假页面 commit b2664417e3775d1deeb67daafea8afd09eba8ff2 Author: yangzhq68909 <993367776@qq.com> Date: Tue Nov 12 14:42:02 2024 +0800 1 commit c1a112754c83e8653d975eda26a6f0636b282188 Author: yangzhq68909 <993367776@qq.com> Date: Fri Nov 8 14:17:40 2024 +0800 1 commit ccfa6e4f11596aa270fe8ec49662c8ecb2c2623a Author: yangzhq68909 <993367776@qq.com> Date: Thu Oct 31 16:38:07 2024 +0800 页面修改 commit f27c6e4ef022d5d459cec4c54d228e4865686b7f Author: yangzhq68909 <993367776@qq.com> Date: Tue Oct 29 15:34:31 2024 +0800 1 commit ba4d6ac0dd9a7925430a7b1c2611dbb6534fdb53 Author: yangzhq68909 <993367776@qq.com> Date: Tue Oct 29 08:23:20 2024 +0800 1 commit 630862178914a9f3af717d8229701851884f5bac Author: yangzhq68909 <993367776@qq.com> Date: Fri Oct 25 11:26:14 2024 +0800 1 commit 4bf243f42b914d5294dce9e735ec950402720b85 Author: yangzhq68909 <993367776@qq.com> Date: Fri Oct 25 11:02:31 2024 +0800 增加流程取回、流程作废功能 commit 60e6f2bd2fc8d5c7bb3c9f9784b681d5958b2167 Author: yangzhq68909 <993367776@qq.com> Date: Thu Oct 24 11:15:16 2024 +0800 流程签收功能 取消组任务 commit 72e1f6c02fe70475b2136facb05a09f6f3ab85f7 Author: yangzhq68909 <993367776@qq.com> Date: Tue Oct 15 08:38:47 2024 +0800 1 commit e88ce332ed5cc070c9d5da0afb0b8ae0b86b4c31 Author: yangzhq68909 <993367776@qq.com> Date: Mon Oct 14 15:46:55 2024 +0800 1 commit 1e857671cbc8332f95ce19b2ec5db204ad5bcd58 Author: yangzhq68909 <993367776@qq.com> Date: Mon Oct 14 15:22:41 2024 +0800 上传附件及回显 commit 6202ab0f4c0658aaa0ae1c0a032ad00065462bcf Author: yangzhq68909 <993367776@qq.com> Date: Mon Oct 14 08:51:28 2024 +0800 1 commit e73c24ff153e28e4b516395bc65e2e9d67c89fa5 Author: yangzhq68909 <993367776@qq.com> Date: Sat Oct 12 09:14:27 2024 +0800 11 commit 646c8016654ad49194f30845987bb088d89a75ed Author: yangzhq68909 <993367776@qq.com> Date: Sat Oct 12 08:53:10 2024 +0800 1 commit 767c647d4a964633b842c73c317a62ae9b2f98ff Author: yangzhq68909 <993367776@qq.com> Date: Thu Oct 10 16:52:10 2024 +0800 1 commit 9a9e8327f6f977a3619d8be1961deb406e354f9c Author: yangzhq68909 <993367776@qq.com> Date: Thu Oct 10 15:32:42 2024 +0800 1 commit c3eb02f52242a91982698b9964ae6195d11be6f7 Author: yangzhq68909 <993367776@qq.com> Date: Sun Sep 29 10:44:16 2024 +0800 icon修改 修改头像接口修改 commit 33666985b65f9df3a20d171e4207ec8a0175c855 Author: yangzhq68909 <993367776@qq.com> Date: Fri Sep 27 11:03:07 2024 +0800 1 commit 8809cc1975b7b2593ac58d1b94812cf79efb4199 Author: yangzhq68909 <993367776@qq.com> Date: Thu Sep 26 12:06:47 2024 +0800 本地登录页面 请假类型选择 commit f9432900bd16a59bf09ead042d8feb5f2212ea73 Author: yangzhq68909 <993367776@qq.com> Date: Tue Sep 24 17:23:37 2024 +0800 1 commit c9a320ddfd27e30dced5b637cc38a1f9dfd26838 Author: yangzhq68909 <993367776@qq.com> Date: Tue Sep 24 17:21:34 2024 +0800 请假流程2.0 commit e7bcd4328d75946533ebea0dc279360f26ebcbc5 Author: yangzhq68909 <993367776@qq.com> Date: Thu Sep 19 16:13:33 2024 +0800 修改接口 commit 267ba082f0134a3355b87e8dc20b02d5354552f1 Author: yangzhq68909 <993367776@qq.com> Date: Thu Sep 19 15:12:58 2024 +0800 修改api接口路径 commit 27c163736de6d9323ccd48aabfec258e75486b34 Author: jiang <358254771@qq.com> Date: Sat Sep 14 10:26:50 2024 +0800 数智产销APP第一版。 commit 14d99971604d13b84f43b4bc7c69394c403dffe7 Author: jiang wen <358254771@qq.com> Date: Sat Sep 14 10:24:54 2024 +0800 Update README.md
2025-01-21 06:13:49 +00:00
function getChildTable() {
console.log(ldhth.value)
2025-01-22 14:29:32 +00:00
queryJxkhByRyLdhth({
"ldhth": ldhth.value
}).then((res) => {
// console.log(res);
jxkhxxList.value = res.result.records
// console.log(jxkhxxList.value)
}).catch((err) => {
console.log(err);
})
Squashed commit of the following: commit c6612d254bf22bd677afc3d15ac9175e48f03efa 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 f4d737e827a788e30e091ef3c5002179fa030761 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 90584edaf966c5ca58b02847f4afe443a1ad9551 Author: 闵 年泽 <627844378@qq.com> Date: Fri Jan 17 16:29:01 2025 +0800 Squashed commit of the following: commit 26ee39e9e038027ea7fa4c740b989b69380660c3 Author: yangzhq68909 <993367776@qq.com> Date: Fri Jan 17 13:48:45 2025 +0800 首页值班跳转路径 commit 0eb5fa4f51f6dfd535f24dc846e061c317cc346a Author: yangzhq68909 <993367776@qq.com> Date: Mon Jan 13 08:44:08 2025 +0800 修改流程节点开始结束中文 commit d11c9c13f21966d683108ea2e1fd723c31a40dcc 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 5be34bd5789536bbaabf0ada35dffe977b8673cd Author: yangzhq68909 <993367776@qq.com> Date: Mon Jan 13 08:24:57 2025 +0800 将流程信息开始结束节点改成中文 commit f5e9d1e611d95b5c987bd2bf104d04ae24e1b12c Author: ldeyun <ldeyun@163.com> Date: Sun Jan 12 18:49:20 2025 +0800 添加uni-modules组件,departSelect commit 23e4f9f409251fe756c192466cd1bd555c3875bd Author: yangzhq68909 <993367776@qq.com> Date: Tue Jan 7 09:44:59 2025 +0800 1 commit a472d67520f26c10b023bf1f9c79257be4140fe4 Author: yangzhq68909 <993367776@qq.com> Date: Mon Jan 6 10:44:29 2025 +0800 请假有效日期范围限制 commit 6054db8315ee657326f5201001c3c9f9c061862e Author: yangzhq68909 <993367776@qq.com> Date: Mon Dec 16 11:40:20 2024 +0800 1 commit 157249f2c660d084f386396134c578d8908fe580 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 ed007cbaf6262d77586034ad3d96698c5540edc9 Author: yangzhq68909 <993367776@qq.com> Date: Fri Dec 6 09:00:15 2024 +0800 请假获取部门修改 commit 20ba06b4f1bbfa66efc88c4e3d63cc894235e416 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 fe7a52cfeff72f37421e6ec81bca398e7da4aabb Author: jiang <358254771@qq.com> Date: Wed Dec 4 17:00:37 2024 +0800 忽略打包文件 commit 3794abbafc31c13ec6f7783e8cdd809a41010142 Author: jiang <358254771@qq.com> Date: Wed Dec 4 16:52:44 2024 +0800 和 commit af4b1b6c0ad3065172698e479fcd0b55f423d7d7 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 ecc98b14a2f6947f947ccb9aa87b48efe0358feb Author: mnz <627844378@qq.com> Date: Wed Dec 4 11:10:13 2024 +0800 修改h5 commit 4c1f42de565aff9837b246029659dae144a3bb11 Author: mnz <627844378@qq.com> Date: Wed Dec 4 11:05:49 2024 +0800 1.修改app h5 commit c9ad71fe35c51270b267ea16a04cdcb6856ba4af Author: jiang <358254771@qq.com> Date: Tue Dec 3 14:08:45 2024 +0800 发布 commit ba291f2d6116ef7843ce41642a87222edd03592c Author: yangzhq68909 <993367776@qq.com> Date: Tue Dec 3 10:52:17 2024 +0800 denglu commit 1ca340b23cc0016c947eb9b7bb83df06cfe39a89 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 0e7e8f3a8d879f5fe96fec535d55f30c4ec30aa2 Author: yangzhq68909 <993367776@qq.com> Date: Tue Nov 26 08:39:05 2024 +0800 忽略unpackage文件,jiang commit a252f9b88bd27abcdc826e21d0c2bcac28da25f3 Author: yangzhq68909 <993367776@qq.com> Date: Tue Nov 12 16:16:01 2024 +0800 修改请假页面 commit b2664417e3775d1deeb67daafea8afd09eba8ff2 Author: yangzhq68909 <993367776@qq.com> Date: Tue Nov 12 14:42:02 2024 +0800 1 commit c1a112754c83e8653d975eda26a6f0636b282188 Author: yangzhq68909 <993367776@qq.com> Date: Fri Nov 8 14:17:40 2024 +0800 1 commit ccfa6e4f11596aa270fe8ec49662c8ecb2c2623a Author: yangzhq68909 <993367776@qq.com> Date: Thu Oct 31 16:38:07 2024 +0800 页面修改 commit f27c6e4ef022d5d459cec4c54d228e4865686b7f Author: yangzhq68909 <993367776@qq.com> Date: Tue Oct 29 15:34:31 2024 +0800 1 commit ba4d6ac0dd9a7925430a7b1c2611dbb6534fdb53 Author: yangzhq68909 <993367776@qq.com> Date: Tue Oct 29 08:23:20 2024 +0800 1 commit 630862178914a9f3af717d8229701851884f5bac Author: yangzhq68909 <993367776@qq.com> Date: Fri Oct 25 11:26:14 2024 +0800 1 commit 4bf243f42b914d5294dce9e735ec950402720b85 Author: yangzhq68909 <993367776@qq.com> Date: Fri Oct 25 11:02:31 2024 +0800 增加流程取回、流程作废功能 commit 60e6f2bd2fc8d5c7bb3c9f9784b681d5958b2167 Author: yangzhq68909 <993367776@qq.com> Date: Thu Oct 24 11:15:16 2024 +0800 流程签收功能 取消组任务 commit 72e1f6c02fe70475b2136facb05a09f6f3ab85f7 Author: yangzhq68909 <993367776@qq.com> Date: Tue Oct 15 08:38:47 2024 +0800 1 commit e88ce332ed5cc070c9d5da0afb0b8ae0b86b4c31 Author: yangzhq68909 <993367776@qq.com> Date: Mon Oct 14 15:46:55 2024 +0800 1 commit 1e857671cbc8332f95ce19b2ec5db204ad5bcd58 Author: yangzhq68909 <993367776@qq.com> Date: Mon Oct 14 15:22:41 2024 +0800 上传附件及回显 commit 6202ab0f4c0658aaa0ae1c0a032ad00065462bcf Author: yangzhq68909 <993367776@qq.com> Date: Mon Oct 14 08:51:28 2024 +0800 1 commit e73c24ff153e28e4b516395bc65e2e9d67c89fa5 Author: yangzhq68909 <993367776@qq.com> Date: Sat Oct 12 09:14:27 2024 +0800 11 commit 646c8016654ad49194f30845987bb088d89a75ed Author: yangzhq68909 <993367776@qq.com> Date: Sat Oct 12 08:53:10 2024 +0800 1 commit 767c647d4a964633b842c73c317a62ae9b2f98ff Author: yangzhq68909 <993367776@qq.com> Date: Thu Oct 10 16:52:10 2024 +0800 1 commit 9a9e8327f6f977a3619d8be1961deb406e354f9c Author: yangzhq68909 <993367776@qq.com> Date: Thu Oct 10 15:32:42 2024 +0800 1 commit c3eb02f52242a91982698b9964ae6195d11be6f7 Author: yangzhq68909 <993367776@qq.com> Date: Sun Sep 29 10:44:16 2024 +0800 icon修改 修改头像接口修改 commit 33666985b65f9df3a20d171e4207ec8a0175c855 Author: yangzhq68909 <993367776@qq.com> Date: Fri Sep 27 11:03:07 2024 +0800 1 commit 8809cc1975b7b2593ac58d1b94812cf79efb4199 Author: yangzhq68909 <993367776@qq.com> Date: Thu Sep 26 12:06:47 2024 +0800 本地登录页面 请假类型选择 commit f9432900bd16a59bf09ead042d8feb5f2212ea73 Author: yangzhq68909 <993367776@qq.com> Date: Tue Sep 24 17:23:37 2024 +0800 1 commit c9a320ddfd27e30dced5b637cc38a1f9dfd26838 Author: yangzhq68909 <993367776@qq.com> Date: Tue Sep 24 17:21:34 2024 +0800 请假流程2.0 commit e7bcd4328d75946533ebea0dc279360f26ebcbc5 Author: yangzhq68909 <993367776@qq.com> Date: Thu Sep 19 16:13:33 2024 +0800 修改接口 commit 267ba082f0134a3355b87e8dc20b02d5354552f1 Author: yangzhq68909 <993367776@qq.com> Date: Thu Sep 19 15:12:58 2024 +0800 修改api接口路径 commit 27c163736de6d9323ccd48aabfec258e75486b34 Author: jiang <358254771@qq.com> Date: Sat Sep 14 10:26:50 2024 +0800 数智产销APP第一版。 commit 14d99971604d13b84f43b4bc7c69394c403dffe7 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 42adfc83d0b98c39aaeb31768a00b510dbea7f21 Author: ldeyun <ldeyun@163.com> Date: Mon Jan 13 10:49:20 2025 +0800 人员统计图表页面 commit 26ee39e9e038027ea7fa4c740b989b69380660c3 Author: yangzhq68909 <993367776@qq.com> Date: Fri Jan 17 13:48:45 2025 +0800 首页值班跳转路径 commit 0eb5fa4f51f6dfd535f24dc846e061c317cc346a Author: yangzhq68909 <993367776@qq.com> Date: Mon Jan 13 08:44:08 2025 +0800 修改流程节点开始结束中文 commit d11c9c13f21966d683108ea2e1fd723c31a40dcc 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 5be34bd5789536bbaabf0ada35dffe977b8673cd Author: yangzhq68909 <993367776@qq.com> Date: Mon Jan 13 08:24:57 2025 +0800 将流程信息开始结束节点改成中文 commit 23e4f9f409251fe756c192466cd1bd555c3875bd Author: yangzhq68909 <993367776@qq.com> Date: Tue Jan 7 09:44:59 2025 +0800 1 commit a472d67520f26c10b023bf1f9c79257be4140fe4 Author: yangzhq68909 <993367776@qq.com> Date: Mon Jan 6 10:44:29 2025 +0800 请假有效日期范围限制 commit 6054db8315ee657326f5201001c3c9f9c061862e Author: yangzhq68909 <993367776@qq.com> Date: Mon Dec 16 11:40:20 2024 +0800 1 commit 157249f2c660d084f386396134c578d8908fe580 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 ed007cbaf6262d77586034ad3d96698c5540edc9 Author: yangzhq68909 <993367776@qq.com> Date: Fri Dec 6 09:00:15 2024 +0800 请假获取部门修改 commit 20ba06b4f1bbfa66efc88c4e3d63cc894235e416 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 fe7a52cfeff72f37421e6ec81bca398e7da4aabb Author: jiang <358254771@qq.com> Date: Wed Dec 4 17:00:37 2024 +0800 忽略打包文件 commit 3794abbafc31c13ec6f7783e8cdd809a41010142 Author: jiang <358254771@qq.com> Date: Wed Dec 4 16:52:44 2024 +0800 和 commit af4b1b6c0ad3065172698e479fcd0b55f423d7d7 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 ecc98b14a2f6947f947ccb9aa87b48efe0358feb Author: mnz <627844378@qq.com> Date: Wed Dec 4 11:10:13 2024 +0800 修改h5 commit 4c1f42de565aff9837b246029659dae144a3bb11 Author: mnz <627844378@qq.com> Date: Wed Dec 4 11:05:49 2024 +0800 1.修改app h5 commit c9ad71fe35c51270b267ea16a04cdcb6856ba4af Author: jiang <358254771@qq.com> Date: Tue Dec 3 14:08:45 2024 +0800 发布 commit ba291f2d6116ef7843ce41642a87222edd03592c Author: yangzhq68909 <993367776@qq.com> Date: Tue Dec 3 10:52:17 2024 +0800 denglu commit 1ca340b23cc0016c947eb9b7bb83df06cfe39a89 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 0e7e8f3a8d879f5fe96fec535d55f30c4ec30aa2 Author: yangzhq68909 <993367776@qq.com> Date: Tue Nov 26 08:39:05 2024 +0800 忽略unpackage文件,jiang commit a252f9b88bd27abcdc826e21d0c2bcac28da25f3 Author: yangzhq68909 <993367776@qq.com> Date: Tue Nov 12 16:16:01 2024 +0800 修改请假页面 commit b2664417e3775d1deeb67daafea8afd09eba8ff2 Author: yangzhq68909 <993367776@qq.com> Date: Tue Nov 12 14:42:02 2024 +0800 1 commit c1a112754c83e8653d975eda26a6f0636b282188 Author: yangzhq68909 <993367776@qq.com> Date: Fri Nov 8 14:17:40 2024 +0800 1 commit ccfa6e4f11596aa270fe8ec49662c8ecb2c2623a Author: yangzhq68909 <993367776@qq.com> Date: Thu Oct 31 16:38:07 2024 +0800 页面修改 commit f27c6e4ef022d5d459cec4c54d228e4865686b7f Author: yangzhq68909 <993367776@qq.com> Date: Tue Oct 29 15:34:31 2024 +0800 1 commit ba4d6ac0dd9a7925430a7b1c2611dbb6534fdb53 Author: yangzhq68909 <993367776@qq.com> Date: Tue Oct 29 08:23:20 2024 +0800 1 commit 630862178914a9f3af717d8229701851884f5bac Author: yangzhq68909 <993367776@qq.com> Date: Fri Oct 25 11:26:14 2024 +0800 1 commit 4bf243f42b914d5294dce9e735ec950402720b85 Author: yangzhq68909 <993367776@qq.com> Date: Fri Oct 25 11:02:31 2024 +0800 增加流程取回、流程作废功能 commit 60e6f2bd2fc8d5c7bb3c9f9784b681d5958b2167 Author: yangzhq68909 <993367776@qq.com> Date: Thu Oct 24 11:15:16 2024 +0800 流程签收功能 取消组任务 commit 72e1f6c02fe70475b2136facb05a09f6f3ab85f7 Author: yangzhq68909 <993367776@qq.com> Date: Tue Oct 15 08:38:47 2024 +0800 1 commit e88ce332ed5cc070c9d5da0afb0b8ae0b86b4c31 Author: yangzhq68909 <993367776@qq.com> Date: Mon Oct 14 15:46:55 2024 +0800 1 commit 1e857671cbc8332f95ce19b2ec5db204ad5bcd58 Author: yangzhq68909 <993367776@qq.com> Date: Mon Oct 14 15:22:41 2024 +0800 上传附件及回显 commit 6202ab0f4c0658aaa0ae1c0a032ad00065462bcf Author: yangzhq68909 <993367776@qq.com> Date: Mon Oct 14 08:51:28 2024 +0800 1 commit e73c24ff153e28e4b516395bc65e2e9d67c89fa5 Author: yangzhq68909 <993367776@qq.com> Date: Sat Oct 12 09:14:27 2024 +0800 11 commit 646c8016654ad49194f30845987bb088d89a75ed Author: yangzhq68909 <993367776@qq.com> Date: Sat Oct 12 08:53:10 2024 +0800 1 commit 767c647d4a964633b842c73c317a62ae9b2f98ff Author: yangzhq68909 <993367776@qq.com> Date: Thu Oct 10 16:52:10 2024 +0800 1 commit 9a9e8327f6f977a3619d8be1961deb406e354f9c Author: yangzhq68909 <993367776@qq.com> Date: Thu Oct 10 15:32:42 2024 +0800 1 commit c3eb02f52242a91982698b9964ae6195d11be6f7 Author: yangzhq68909 <993367776@qq.com> Date: Sun Sep 29 10:44:16 2024 +0800 icon修改 修改头像接口修改 commit 33666985b65f9df3a20d171e4207ec8a0175c855 Author: yangzhq68909 <993367776@qq.com> Date: Fri Sep 27 11:03:07 2024 +0800 1 commit 8809cc1975b7b2593ac58d1b94812cf79efb4199 Author: yangzhq68909 <993367776@qq.com> Date: Thu Sep 26 12:06:47 2024 +0800 本地登录页面 请假类型选择 commit f9432900bd16a59bf09ead042d8feb5f2212ea73 Author: yangzhq68909 <993367776@qq.com> Date: Tue Sep 24 17:23:37 2024 +0800 1 commit c9a320ddfd27e30dced5b637cc38a1f9dfd26838 Author: yangzhq68909 <993367776@qq.com> Date: Tue Sep 24 17:21:34 2024 +0800 请假流程2.0 commit e7bcd4328d75946533ebea0dc279360f26ebcbc5 Author: yangzhq68909 <993367776@qq.com> Date: Thu Sep 19 16:13:33 2024 +0800 修改接口 commit 267ba082f0134a3355b87e8dc20b02d5354552f1 Author: yangzhq68909 <993367776@qq.com> Date: Thu Sep 19 15:12:58 2024 +0800 修改api接口路径 commit 27c163736de6d9323ccd48aabfec258e75486b34 Author: jiang <358254771@qq.com> Date: Sat Sep 14 10:26:50 2024 +0800 数智产销APP第一版。 commit 14d99971604d13b84f43b4bc7c69394c403dffe7 Author: jiang wen <358254771@qq.com> Date: Sat Sep 14 10:24:54 2024 +0800 Update README.md
2025-01-21 06:13:49 +00:00
queryGbxxByRyLdhth({
"ldhth": ldhth.value
}).then((res) => {
// console.log(res);
gbxxList.value = res
// console.log(gbxxList.value)
}).catch((err) => {
console.log(err);
})
queryZyzgdjByRyLdhth({
"ldhth": ldhth.value
}).then((res) => {
// console.log(res);
zyzgdjList.value = res
// console.log(zyzgdjList.value)
}).catch((err) => {
console.log(err);
})
queryGzjlByRyLdhth({
"ldhth": ldhth.value
}).then((res) => {
// console.log(res);
if (res.length > 0) {
gzjlList.value = res
}
}).catch((err) => {
console.log(err);
})
queryQzqkByRyLdhth({
"ldhth": ldhth.value
}).then((res) => {
// console.log(res);
if (res.length > 0) {
zjtzList.value = res
}
}).catch((err) => {
console.log(err);
})
queryJtzycyByRyLdhth({
"ldhth": ldhth.value
}).then((res) => {
// console.log(res);
if (res.length > 0) {
zyjtcyList.value = res
}
}).catch((err) => {
console.log(err);
})
queryXlxxByRyLdhth({
"ldhth": ldhth.value
}).then((res) => {
if (res.success) {
xlxxList.value = []
if (res.result.records.length > 0) {
var rress = res.result.records
2025-01-22 14:29:32 +00:00
// console.log(rress);
Squashed commit of the following: commit c6612d254bf22bd677afc3d15ac9175e48f03efa 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 f4d737e827a788e30e091ef3c5002179fa030761 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 90584edaf966c5ca58b02847f4afe443a1ad9551 Author: 闵 年泽 <627844378@qq.com> Date: Fri Jan 17 16:29:01 2025 +0800 Squashed commit of the following: commit 26ee39e9e038027ea7fa4c740b989b69380660c3 Author: yangzhq68909 <993367776@qq.com> Date: Fri Jan 17 13:48:45 2025 +0800 首页值班跳转路径 commit 0eb5fa4f51f6dfd535f24dc846e061c317cc346a Author: yangzhq68909 <993367776@qq.com> Date: Mon Jan 13 08:44:08 2025 +0800 修改流程节点开始结束中文 commit d11c9c13f21966d683108ea2e1fd723c31a40dcc 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 5be34bd5789536bbaabf0ada35dffe977b8673cd Author: yangzhq68909 <993367776@qq.com> Date: Mon Jan 13 08:24:57 2025 +0800 将流程信息开始结束节点改成中文 commit f5e9d1e611d95b5c987bd2bf104d04ae24e1b12c Author: ldeyun <ldeyun@163.com> Date: Sun Jan 12 18:49:20 2025 +0800 添加uni-modules组件,departSelect commit 23e4f9f409251fe756c192466cd1bd555c3875bd Author: yangzhq68909 <993367776@qq.com> Date: Tue Jan 7 09:44:59 2025 +0800 1 commit a472d67520f26c10b023bf1f9c79257be4140fe4 Author: yangzhq68909 <993367776@qq.com> Date: Mon Jan 6 10:44:29 2025 +0800 请假有效日期范围限制 commit 6054db8315ee657326f5201001c3c9f9c061862e Author: yangzhq68909 <993367776@qq.com> Date: Mon Dec 16 11:40:20 2024 +0800 1 commit 157249f2c660d084f386396134c578d8908fe580 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 ed007cbaf6262d77586034ad3d96698c5540edc9 Author: yangzhq68909 <993367776@qq.com> Date: Fri Dec 6 09:00:15 2024 +0800 请假获取部门修改 commit 20ba06b4f1bbfa66efc88c4e3d63cc894235e416 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 fe7a52cfeff72f37421e6ec81bca398e7da4aabb Author: jiang <358254771@qq.com> Date: Wed Dec 4 17:00:37 2024 +0800 忽略打包文件 commit 3794abbafc31c13ec6f7783e8cdd809a41010142 Author: jiang <358254771@qq.com> Date: Wed Dec 4 16:52:44 2024 +0800 和 commit af4b1b6c0ad3065172698e479fcd0b55f423d7d7 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 ecc98b14a2f6947f947ccb9aa87b48efe0358feb Author: mnz <627844378@qq.com> Date: Wed Dec 4 11:10:13 2024 +0800 修改h5 commit 4c1f42de565aff9837b246029659dae144a3bb11 Author: mnz <627844378@qq.com> Date: Wed Dec 4 11:05:49 2024 +0800 1.修改app h5 commit c9ad71fe35c51270b267ea16a04cdcb6856ba4af Author: jiang <358254771@qq.com> Date: Tue Dec 3 14:08:45 2024 +0800 发布 commit ba291f2d6116ef7843ce41642a87222edd03592c Author: yangzhq68909 <993367776@qq.com> Date: Tue Dec 3 10:52:17 2024 +0800 denglu commit 1ca340b23cc0016c947eb9b7bb83df06cfe39a89 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 0e7e8f3a8d879f5fe96fec535d55f30c4ec30aa2 Author: yangzhq68909 <993367776@qq.com> Date: Tue Nov 26 08:39:05 2024 +0800 忽略unpackage文件,jiang commit a252f9b88bd27abcdc826e21d0c2bcac28da25f3 Author: yangzhq68909 <993367776@qq.com> Date: Tue Nov 12 16:16:01 2024 +0800 修改请假页面 commit b2664417e3775d1deeb67daafea8afd09eba8ff2 Author: yangzhq68909 <993367776@qq.com> Date: Tue Nov 12 14:42:02 2024 +0800 1 commit c1a112754c83e8653d975eda26a6f0636b282188 Author: yangzhq68909 <993367776@qq.com> Date: Fri Nov 8 14:17:40 2024 +0800 1 commit ccfa6e4f11596aa270fe8ec49662c8ecb2c2623a Author: yangzhq68909 <993367776@qq.com> Date: Thu Oct 31 16:38:07 2024 +0800 页面修改 commit f27c6e4ef022d5d459cec4c54d228e4865686b7f Author: yangzhq68909 <993367776@qq.com> Date: Tue Oct 29 15:34:31 2024 +0800 1 commit ba4d6ac0dd9a7925430a7b1c2611dbb6534fdb53 Author: yangzhq68909 <993367776@qq.com> Date: Tue Oct 29 08:23:20 2024 +0800 1 commit 630862178914a9f3af717d8229701851884f5bac Author: yangzhq68909 <993367776@qq.com> Date: Fri Oct 25 11:26:14 2024 +0800 1 commit 4bf243f42b914d5294dce9e735ec950402720b85 Author: yangzhq68909 <993367776@qq.com> Date: Fri Oct 25 11:02:31 2024 +0800 增加流程取回、流程作废功能 commit 60e6f2bd2fc8d5c7bb3c9f9784b681d5958b2167 Author: yangzhq68909 <993367776@qq.com> Date: Thu Oct 24 11:15:16 2024 +0800 流程签收功能 取消组任务 commit 72e1f6c02fe70475b2136facb05a09f6f3ab85f7 Author: yangzhq68909 <993367776@qq.com> Date: Tue Oct 15 08:38:47 2024 +0800 1 commit e88ce332ed5cc070c9d5da0afb0b8ae0b86b4c31 Author: yangzhq68909 <993367776@qq.com> Date: Mon Oct 14 15:46:55 2024 +0800 1 commit 1e857671cbc8332f95ce19b2ec5db204ad5bcd58 Author: yangzhq68909 <993367776@qq.com> Date: Mon Oct 14 15:22:41 2024 +0800 上传附件及回显 commit 6202ab0f4c0658aaa0ae1c0a032ad00065462bcf Author: yangzhq68909 <993367776@qq.com> Date: Mon Oct 14 08:51:28 2024 +0800 1 commit e73c24ff153e28e4b516395bc65e2e9d67c89fa5 Author: yangzhq68909 <993367776@qq.com> Date: Sat Oct 12 09:14:27 2024 +0800 11 commit 646c8016654ad49194f30845987bb088d89a75ed Author: yangzhq68909 <993367776@qq.com> Date: Sat Oct 12 08:53:10 2024 +0800 1 commit 767c647d4a964633b842c73c317a62ae9b2f98ff Author: yangzhq68909 <993367776@qq.com> Date: Thu Oct 10 16:52:10 2024 +0800 1 commit 9a9e8327f6f977a3619d8be1961deb406e354f9c Author: yangzhq68909 <993367776@qq.com> Date: Thu Oct 10 15:32:42 2024 +0800 1 commit c3eb02f52242a91982698b9964ae6195d11be6f7 Author: yangzhq68909 <993367776@qq.com> Date: Sun Sep 29 10:44:16 2024 +0800 icon修改 修改头像接口修改 commit 33666985b65f9df3a20d171e4207ec8a0175c855 Author: yangzhq68909 <993367776@qq.com> Date: Fri Sep 27 11:03:07 2024 +0800 1 commit 8809cc1975b7b2593ac58d1b94812cf79efb4199 Author: yangzhq68909 <993367776@qq.com> Date: Thu Sep 26 12:06:47 2024 +0800 本地登录页面 请假类型选择 commit f9432900bd16a59bf09ead042d8feb5f2212ea73 Author: yangzhq68909 <993367776@qq.com> Date: Tue Sep 24 17:23:37 2024 +0800 1 commit c9a320ddfd27e30dced5b637cc38a1f9dfd26838 Author: yangzhq68909 <993367776@qq.com> Date: Tue Sep 24 17:21:34 2024 +0800 请假流程2.0 commit e7bcd4328d75946533ebea0dc279360f26ebcbc5 Author: yangzhq68909 <993367776@qq.com> Date: Thu Sep 19 16:13:33 2024 +0800 修改接口 commit 267ba082f0134a3355b87e8dc20b02d5354552f1 Author: yangzhq68909 <993367776@qq.com> Date: Thu Sep 19 15:12:58 2024 +0800 修改api接口路径 commit 27c163736de6d9323ccd48aabfec258e75486b34 Author: jiang <358254771@qq.com> Date: Sat Sep 14 10:26:50 2024 +0800 数智产销APP第一版。 commit 14d99971604d13b84f43b4bc7c69394c403dffe7 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 42adfc83d0b98c39aaeb31768a00b510dbea7f21 Author: ldeyun <ldeyun@163.com> Date: Mon Jan 13 10:49:20 2025 +0800 人员统计图表页面 commit 26ee39e9e038027ea7fa4c740b989b69380660c3 Author: yangzhq68909 <993367776@qq.com> Date: Fri Jan 17 13:48:45 2025 +0800 首页值班跳转路径 commit 0eb5fa4f51f6dfd535f24dc846e061c317cc346a Author: yangzhq68909 <993367776@qq.com> Date: Mon Jan 13 08:44:08 2025 +0800 修改流程节点开始结束中文 commit d11c9c13f21966d683108ea2e1fd723c31a40dcc 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 5be34bd5789536bbaabf0ada35dffe977b8673cd Author: yangzhq68909 <993367776@qq.com> Date: Mon Jan 13 08:24:57 2025 +0800 将流程信息开始结束节点改成中文 commit 23e4f9f409251fe756c192466cd1bd555c3875bd Author: yangzhq68909 <993367776@qq.com> Date: Tue Jan 7 09:44:59 2025 +0800 1 commit a472d67520f26c10b023bf1f9c79257be4140fe4 Author: yangzhq68909 <993367776@qq.com> Date: Mon Jan 6 10:44:29 2025 +0800 请假有效日期范围限制 commit 6054db8315ee657326f5201001c3c9f9c061862e Author: yangzhq68909 <993367776@qq.com> Date: Mon Dec 16 11:40:20 2024 +0800 1 commit 157249f2c660d084f386396134c578d8908fe580 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 ed007cbaf6262d77586034ad3d96698c5540edc9 Author: yangzhq68909 <993367776@qq.com> Date: Fri Dec 6 09:00:15 2024 +0800 请假获取部门修改 commit 20ba06b4f1bbfa66efc88c4e3d63cc894235e416 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 fe7a52cfeff72f37421e6ec81bca398e7da4aabb Author: jiang <358254771@qq.com> Date: Wed Dec 4 17:00:37 2024 +0800 忽略打包文件 commit 3794abbafc31c13ec6f7783e8cdd809a41010142 Author: jiang <358254771@qq.com> Date: Wed Dec 4 16:52:44 2024 +0800 和 commit af4b1b6c0ad3065172698e479fcd0b55f423d7d7 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 ecc98b14a2f6947f947ccb9aa87b48efe0358feb Author: mnz <627844378@qq.com> Date: Wed Dec 4 11:10:13 2024 +0800 修改h5 commit 4c1f42de565aff9837b246029659dae144a3bb11 Author: mnz <627844378@qq.com> Date: Wed Dec 4 11:05:49 2024 +0800 1.修改app h5 commit c9ad71fe35c51270b267ea16a04cdcb6856ba4af Author: jiang <358254771@qq.com> Date: Tue Dec 3 14:08:45 2024 +0800 发布 commit ba291f2d6116ef7843ce41642a87222edd03592c Author: yangzhq68909 <993367776@qq.com> Date: Tue Dec 3 10:52:17 2024 +0800 denglu commit 1ca340b23cc0016c947eb9b7bb83df06cfe39a89 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 0e7e8f3a8d879f5fe96fec535d55f30c4ec30aa2 Author: yangzhq68909 <993367776@qq.com> Date: Tue Nov 26 08:39:05 2024 +0800 忽略unpackage文件,jiang commit a252f9b88bd27abcdc826e21d0c2bcac28da25f3 Author: yangzhq68909 <993367776@qq.com> Date: Tue Nov 12 16:16:01 2024 +0800 修改请假页面 commit b2664417e3775d1deeb67daafea8afd09eba8ff2 Author: yangzhq68909 <993367776@qq.com> Date: Tue Nov 12 14:42:02 2024 +0800 1 commit c1a112754c83e8653d975eda26a6f0636b282188 Author: yangzhq68909 <993367776@qq.com> Date: Fri Nov 8 14:17:40 2024 +0800 1 commit ccfa6e4f11596aa270fe8ec49662c8ecb2c2623a Author: yangzhq68909 <993367776@qq.com> Date: Thu Oct 31 16:38:07 2024 +0800 页面修改 commit f27c6e4ef022d5d459cec4c54d228e4865686b7f Author: yangzhq68909 <993367776@qq.com> Date: Tue Oct 29 15:34:31 2024 +0800 1 commit ba4d6ac0dd9a7925430a7b1c2611dbb6534fdb53 Author: yangzhq68909 <993367776@qq.com> Date: Tue Oct 29 08:23:20 2024 +0800 1 commit 630862178914a9f3af717d8229701851884f5bac Author: yangzhq68909 <993367776@qq.com> Date: Fri Oct 25 11:26:14 2024 +0800 1 commit 4bf243f42b914d5294dce9e735ec950402720b85 Author: yangzhq68909 <993367776@qq.com> Date: Fri Oct 25 11:02:31 2024 +0800 增加流程取回、流程作废功能 commit 60e6f2bd2fc8d5c7bb3c9f9784b681d5958b2167 Author: yangzhq68909 <993367776@qq.com> Date: Thu Oct 24 11:15:16 2024 +0800 流程签收功能 取消组任务 commit 72e1f6c02fe70475b2136facb05a09f6f3ab85f7 Author: yangzhq68909 <993367776@qq.com> Date: Tue Oct 15 08:38:47 2024 +0800 1 commit e88ce332ed5cc070c9d5da0afb0b8ae0b86b4c31 Author: yangzhq68909 <993367776@qq.com> Date: Mon Oct 14 15:46:55 2024 +0800 1 commit 1e857671cbc8332f95ce19b2ec5db204ad5bcd58 Author: yangzhq68909 <993367776@qq.com> Date: Mon Oct 14 15:22:41 2024 +0800 上传附件及回显 commit 6202ab0f4c0658aaa0ae1c0a032ad00065462bcf Author: yangzhq68909 <993367776@qq.com> Date: Mon Oct 14 08:51:28 2024 +0800 1 commit e73c24ff153e28e4b516395bc65e2e9d67c89fa5 Author: yangzhq68909 <993367776@qq.com> Date: Sat Oct 12 09:14:27 2024 +0800 11 commit 646c8016654ad49194f30845987bb088d89a75ed Author: yangzhq68909 <993367776@qq.com> Date: Sat Oct 12 08:53:10 2024 +0800 1 commit 767c647d4a964633b842c73c317a62ae9b2f98ff Author: yangzhq68909 <993367776@qq.com> Date: Thu Oct 10 16:52:10 2024 +0800 1 commit 9a9e8327f6f977a3619d8be1961deb406e354f9c Author: yangzhq68909 <993367776@qq.com> Date: Thu Oct 10 15:32:42 2024 +0800 1 commit c3eb02f52242a91982698b9964ae6195d11be6f7 Author: yangzhq68909 <993367776@qq.com> Date: Sun Sep 29 10:44:16 2024 +0800 icon修改 修改头像接口修改 commit 33666985b65f9df3a20d171e4207ec8a0175c855 Author: yangzhq68909 <993367776@qq.com> Date: Fri Sep 27 11:03:07 2024 +0800 1 commit 8809cc1975b7b2593ac58d1b94812cf79efb4199 Author: yangzhq68909 <993367776@qq.com> Date: Thu Sep 26 12:06:47 2024 +0800 本地登录页面 请假类型选择 commit f9432900bd16a59bf09ead042d8feb5f2212ea73 Author: yangzhq68909 <993367776@qq.com> Date: Tue Sep 24 17:23:37 2024 +0800 1 commit c9a320ddfd27e30dced5b637cc38a1f9dfd26838 Author: yangzhq68909 <993367776@qq.com> Date: Tue Sep 24 17:21:34 2024 +0800 请假流程2.0 commit e7bcd4328d75946533ebea0dc279360f26ebcbc5 Author: yangzhq68909 <993367776@qq.com> Date: Thu Sep 19 16:13:33 2024 +0800 修改接口 commit 267ba082f0134a3355b87e8dc20b02d5354552f1 Author: yangzhq68909 <993367776@qq.com> Date: Thu Sep 19 15:12:58 2024 +0800 修改api接口路径 commit 27c163736de6d9323ccd48aabfec258e75486b34 Author: jiang <358254771@qq.com> Date: Sat Sep 14 10:26:50 2024 +0800 数智产销APP第一版。 commit 14d99971604d13b84f43b4bc7c69394c403dffe7 Author: jiang wen <358254771@qq.com> Date: Sat Sep 14 10:24:54 2024 +0800 Update README.md
2025-01-21 06:13:49 +00:00
for (let i = 0; i < rress.length; i++) {
2025-01-22 14:29:32 +00:00
if (rress[i].onexl == 1 & rress[i].zgxl == 1) {
rress[i].xllb = "第一学历"
xlxxList.value.push(JSON.parse(JSON.stringify(rress[i])))
// console.log(xlxxList.value)
rress[i].xllb = "最高学历"
xlxxList.value.push(JSON.parse(JSON.stringify(rress[i])))
// console.log(xlxxList.value)
}
if (rress[i].onexl == 1 & rress[i].zgxl != 1) {
Squashed commit of the following: commit c6612d254bf22bd677afc3d15ac9175e48f03efa 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 f4d737e827a788e30e091ef3c5002179fa030761 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 90584edaf966c5ca58b02847f4afe443a1ad9551 Author: 闵 年泽 <627844378@qq.com> Date: Fri Jan 17 16:29:01 2025 +0800 Squashed commit of the following: commit 26ee39e9e038027ea7fa4c740b989b69380660c3 Author: yangzhq68909 <993367776@qq.com> Date: Fri Jan 17 13:48:45 2025 +0800 首页值班跳转路径 commit 0eb5fa4f51f6dfd535f24dc846e061c317cc346a Author: yangzhq68909 <993367776@qq.com> Date: Mon Jan 13 08:44:08 2025 +0800 修改流程节点开始结束中文 commit d11c9c13f21966d683108ea2e1fd723c31a40dcc 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 5be34bd5789536bbaabf0ada35dffe977b8673cd Author: yangzhq68909 <993367776@qq.com> Date: Mon Jan 13 08:24:57 2025 +0800 将流程信息开始结束节点改成中文 commit f5e9d1e611d95b5c987bd2bf104d04ae24e1b12c Author: ldeyun <ldeyun@163.com> Date: Sun Jan 12 18:49:20 2025 +0800 添加uni-modules组件,departSelect commit 23e4f9f409251fe756c192466cd1bd555c3875bd Author: yangzhq68909 <993367776@qq.com> Date: Tue Jan 7 09:44:59 2025 +0800 1 commit a472d67520f26c10b023bf1f9c79257be4140fe4 Author: yangzhq68909 <993367776@qq.com> Date: Mon Jan 6 10:44:29 2025 +0800 请假有效日期范围限制 commit 6054db8315ee657326f5201001c3c9f9c061862e Author: yangzhq68909 <993367776@qq.com> Date: Mon Dec 16 11:40:20 2024 +0800 1 commit 157249f2c660d084f386396134c578d8908fe580 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 ed007cbaf6262d77586034ad3d96698c5540edc9 Author: yangzhq68909 <993367776@qq.com> Date: Fri Dec 6 09:00:15 2024 +0800 请假获取部门修改 commit 20ba06b4f1bbfa66efc88c4e3d63cc894235e416 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 fe7a52cfeff72f37421e6ec81bca398e7da4aabb Author: jiang <358254771@qq.com> Date: Wed Dec 4 17:00:37 2024 +0800 忽略打包文件 commit 3794abbafc31c13ec6f7783e8cdd809a41010142 Author: jiang <358254771@qq.com> Date: Wed Dec 4 16:52:44 2024 +0800 和 commit af4b1b6c0ad3065172698e479fcd0b55f423d7d7 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 ecc98b14a2f6947f947ccb9aa87b48efe0358feb Author: mnz <627844378@qq.com> Date: Wed Dec 4 11:10:13 2024 +0800 修改h5 commit 4c1f42de565aff9837b246029659dae144a3bb11 Author: mnz <627844378@qq.com> Date: Wed Dec 4 11:05:49 2024 +0800 1.修改app h5 commit c9ad71fe35c51270b267ea16a04cdcb6856ba4af Author: jiang <358254771@qq.com> Date: Tue Dec 3 14:08:45 2024 +0800 发布 commit ba291f2d6116ef7843ce41642a87222edd03592c Author: yangzhq68909 <993367776@qq.com> Date: Tue Dec 3 10:52:17 2024 +0800 denglu commit 1ca340b23cc0016c947eb9b7bb83df06cfe39a89 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 0e7e8f3a8d879f5fe96fec535d55f30c4ec30aa2 Author: yangzhq68909 <993367776@qq.com> Date: Tue Nov 26 08:39:05 2024 +0800 忽略unpackage文件,jiang commit a252f9b88bd27abcdc826e21d0c2bcac28da25f3 Author: yangzhq68909 <993367776@qq.com> Date: Tue Nov 12 16:16:01 2024 +0800 修改请假页面 commit b2664417e3775d1deeb67daafea8afd09eba8ff2 Author: yangzhq68909 <993367776@qq.com> Date: Tue Nov 12 14:42:02 2024 +0800 1 commit c1a112754c83e8653d975eda26a6f0636b282188 Author: yangzhq68909 <993367776@qq.com> Date: Fri Nov 8 14:17:40 2024 +0800 1 commit ccfa6e4f11596aa270fe8ec49662c8ecb2c2623a Author: yangzhq68909 <993367776@qq.com> Date: Thu Oct 31 16:38:07 2024 +0800 页面修改 commit f27c6e4ef022d5d459cec4c54d228e4865686b7f Author: yangzhq68909 <993367776@qq.com> Date: Tue Oct 29 15:34:31 2024 +0800 1 commit ba4d6ac0dd9a7925430a7b1c2611dbb6534fdb53 Author: yangzhq68909 <993367776@qq.com> Date: Tue Oct 29 08:23:20 2024 +0800 1 commit 630862178914a9f3af717d8229701851884f5bac Author: yangzhq68909 <993367776@qq.com> Date: Fri Oct 25 11:26:14 2024 +0800 1 commit 4bf243f42b914d5294dce9e735ec950402720b85 Author: yangzhq68909 <993367776@qq.com> Date: Fri Oct 25 11:02:31 2024 +0800 增加流程取回、流程作废功能 commit 60e6f2bd2fc8d5c7bb3c9f9784b681d5958b2167 Author: yangzhq68909 <993367776@qq.com> Date: Thu Oct 24 11:15:16 2024 +0800 流程签收功能 取消组任务 commit 72e1f6c02fe70475b2136facb05a09f6f3ab85f7 Author: yangzhq68909 <993367776@qq.com> Date: Tue Oct 15 08:38:47 2024 +0800 1 commit e88ce332ed5cc070c9d5da0afb0b8ae0b86b4c31 Author: yangzhq68909 <993367776@qq.com> Date: Mon Oct 14 15:46:55 2024 +0800 1 commit 1e857671cbc8332f95ce19b2ec5db204ad5bcd58 Author: yangzhq68909 <993367776@qq.com> Date: Mon Oct 14 15:22:41 2024 +0800 上传附件及回显 commit 6202ab0f4c0658aaa0ae1c0a032ad00065462bcf Author: yangzhq68909 <993367776@qq.com> Date: Mon Oct 14 08:51:28 2024 +0800 1 commit e73c24ff153e28e4b516395bc65e2e9d67c89fa5 Author: yangzhq68909 <993367776@qq.com> Date: Sat Oct 12 09:14:27 2024 +0800 11 commit 646c8016654ad49194f30845987bb088d89a75ed Author: yangzhq68909 <993367776@qq.com> Date: Sat Oct 12 08:53:10 2024 +0800 1 commit 767c647d4a964633b842c73c317a62ae9b2f98ff Author: yangzhq68909 <993367776@qq.com> Date: Thu Oct 10 16:52:10 2024 +0800 1 commit 9a9e8327f6f977a3619d8be1961deb406e354f9c Author: yangzhq68909 <993367776@qq.com> Date: Thu Oct 10 15:32:42 2024 +0800 1 commit c3eb02f52242a91982698b9964ae6195d11be6f7 Author: yangzhq68909 <993367776@qq.com> Date: Sun Sep 29 10:44:16 2024 +0800 icon修改 修改头像接口修改 commit 33666985b65f9df3a20d171e4207ec8a0175c855 Author: yangzhq68909 <993367776@qq.com> Date: Fri Sep 27 11:03:07 2024 +0800 1 commit 8809cc1975b7b2593ac58d1b94812cf79efb4199 Author: yangzhq68909 <993367776@qq.com> Date: Thu Sep 26 12:06:47 2024 +0800 本地登录页面 请假类型选择 commit f9432900bd16a59bf09ead042d8feb5f2212ea73 Author: yangzhq68909 <993367776@qq.com> Date: Tue Sep 24 17:23:37 2024 +0800 1 commit c9a320ddfd27e30dced5b637cc38a1f9dfd26838 Author: yangzhq68909 <993367776@qq.com> Date: Tue Sep 24 17:21:34 2024 +0800 请假流程2.0 commit e7bcd4328d75946533ebea0dc279360f26ebcbc5 Author: yangzhq68909 <993367776@qq.com> Date: Thu Sep 19 16:13:33 2024 +0800 修改接口 commit 267ba082f0134a3355b87e8dc20b02d5354552f1 Author: yangzhq68909 <993367776@qq.com> Date: Thu Sep 19 15:12:58 2024 +0800 修改api接口路径 commit 27c163736de6d9323ccd48aabfec258e75486b34 Author: jiang <358254771@qq.com> Date: Sat Sep 14 10:26:50 2024 +0800 数智产销APP第一版。 commit 14d99971604d13b84f43b4bc7c69394c403dffe7 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 42adfc83d0b98c39aaeb31768a00b510dbea7f21 Author: ldeyun <ldeyun@163.com> Date: Mon Jan 13 10:49:20 2025 +0800 人员统计图表页面 commit 26ee39e9e038027ea7fa4c740b989b69380660c3 Author: yangzhq68909 <993367776@qq.com> Date: Fri Jan 17 13:48:45 2025 +0800 首页值班跳转路径 commit 0eb5fa4f51f6dfd535f24dc846e061c317cc346a Author: yangzhq68909 <993367776@qq.com> Date: Mon Jan 13 08:44:08 2025 +0800 修改流程节点开始结束中文 commit d11c9c13f21966d683108ea2e1fd723c31a40dcc 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 5be34bd5789536bbaabf0ada35dffe977b8673cd Author: yangzhq68909 <993367776@qq.com> Date: Mon Jan 13 08:24:57 2025 +0800 将流程信息开始结束节点改成中文 commit 23e4f9f409251fe756c192466cd1bd555c3875bd Author: yangzhq68909 <993367776@qq.com> Date: Tue Jan 7 09:44:59 2025 +0800 1 commit a472d67520f26c10b023bf1f9c79257be4140fe4 Author: yangzhq68909 <993367776@qq.com> Date: Mon Jan 6 10:44:29 2025 +0800 请假有效日期范围限制 commit 6054db8315ee657326f5201001c3c9f9c061862e Author: yangzhq68909 <993367776@qq.com> Date: Mon Dec 16 11:40:20 2024 +0800 1 commit 157249f2c660d084f386396134c578d8908fe580 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 ed007cbaf6262d77586034ad3d96698c5540edc9 Author: yangzhq68909 <993367776@qq.com> Date: Fri Dec 6 09:00:15 2024 +0800 请假获取部门修改 commit 20ba06b4f1bbfa66efc88c4e3d63cc894235e416 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 fe7a52cfeff72f37421e6ec81bca398e7da4aabb Author: jiang <358254771@qq.com> Date: Wed Dec 4 17:00:37 2024 +0800 忽略打包文件 commit 3794abbafc31c13ec6f7783e8cdd809a41010142 Author: jiang <358254771@qq.com> Date: Wed Dec 4 16:52:44 2024 +0800 和 commit af4b1b6c0ad3065172698e479fcd0b55f423d7d7 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 ecc98b14a2f6947f947ccb9aa87b48efe0358feb Author: mnz <627844378@qq.com> Date: Wed Dec 4 11:10:13 2024 +0800 修改h5 commit 4c1f42de565aff9837b246029659dae144a3bb11 Author: mnz <627844378@qq.com> Date: Wed Dec 4 11:05:49 2024 +0800 1.修改app h5 commit c9ad71fe35c51270b267ea16a04cdcb6856ba4af Author: jiang <358254771@qq.com> Date: Tue Dec 3 14:08:45 2024 +0800 发布 commit ba291f2d6116ef7843ce41642a87222edd03592c Author: yangzhq68909 <993367776@qq.com> Date: Tue Dec 3 10:52:17 2024 +0800 denglu commit 1ca340b23cc0016c947eb9b7bb83df06cfe39a89 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 0e7e8f3a8d879f5fe96fec535d55f30c4ec30aa2 Author: yangzhq68909 <993367776@qq.com> Date: Tue Nov 26 08:39:05 2024 +0800 忽略unpackage文件,jiang commit a252f9b88bd27abcdc826e21d0c2bcac28da25f3 Author: yangzhq68909 <993367776@qq.com> Date: Tue Nov 12 16:16:01 2024 +0800 修改请假页面 commit b2664417e3775d1deeb67daafea8afd09eba8ff2 Author: yangzhq68909 <993367776@qq.com> Date: Tue Nov 12 14:42:02 2024 +0800 1 commit c1a112754c83e8653d975eda26a6f0636b282188 Author: yangzhq68909 <993367776@qq.com> Date: Fri Nov 8 14:17:40 2024 +0800 1 commit ccfa6e4f11596aa270fe8ec49662c8ecb2c2623a Author: yangzhq68909 <993367776@qq.com> Date: Thu Oct 31 16:38:07 2024 +0800 页面修改 commit f27c6e4ef022d5d459cec4c54d228e4865686b7f Author: yangzhq68909 <993367776@qq.com> Date: Tue Oct 29 15:34:31 2024 +0800 1 commit ba4d6ac0dd9a7925430a7b1c2611dbb6534fdb53 Author: yangzhq68909 <993367776@qq.com> Date: Tue Oct 29 08:23:20 2024 +0800 1 commit 630862178914a9f3af717d8229701851884f5bac Author: yangzhq68909 <993367776@qq.com> Date: Fri Oct 25 11:26:14 2024 +0800 1 commit 4bf243f42b914d5294dce9e735ec950402720b85 Author: yangzhq68909 <993367776@qq.com> Date: Fri Oct 25 11:02:31 2024 +0800 增加流程取回、流程作废功能 commit 60e6f2bd2fc8d5c7bb3c9f9784b681d5958b2167 Author: yangzhq68909 <993367776@qq.com> Date: Thu Oct 24 11:15:16 2024 +0800 流程签收功能 取消组任务 commit 72e1f6c02fe70475b2136facb05a09f6f3ab85f7 Author: yangzhq68909 <993367776@qq.com> Date: Tue Oct 15 08:38:47 2024 +0800 1 commit e88ce332ed5cc070c9d5da0afb0b8ae0b86b4c31 Author: yangzhq68909 <993367776@qq.com> Date: Mon Oct 14 15:46:55 2024 +0800 1 commit 1e857671cbc8332f95ce19b2ec5db204ad5bcd58 Author: yangzhq68909 <993367776@qq.com> Date: Mon Oct 14 15:22:41 2024 +0800 上传附件及回显 commit 6202ab0f4c0658aaa0ae1c0a032ad00065462bcf Author: yangzhq68909 <993367776@qq.com> Date: Mon Oct 14 08:51:28 2024 +0800 1 commit e73c24ff153e28e4b516395bc65e2e9d67c89fa5 Author: yangzhq68909 <993367776@qq.com> Date: Sat Oct 12 09:14:27 2024 +0800 11 commit 646c8016654ad49194f30845987bb088d89a75ed Author: yangzhq68909 <993367776@qq.com> Date: Sat Oct 12 08:53:10 2024 +0800 1 commit 767c647d4a964633b842c73c317a62ae9b2f98ff Author: yangzhq68909 <993367776@qq.com> Date: Thu Oct 10 16:52:10 2024 +0800 1 commit 9a9e8327f6f977a3619d8be1961deb406e354f9c Author: yangzhq68909 <993367776@qq.com> Date: Thu Oct 10 15:32:42 2024 +0800 1 commit c3eb02f52242a91982698b9964ae6195d11be6f7 Author: yangzhq68909 <993367776@qq.com> Date: Sun Sep 29 10:44:16 2024 +0800 icon修改 修改头像接口修改 commit 33666985b65f9df3a20d171e4207ec8a0175c855 Author: yangzhq68909 <993367776@qq.com> Date: Fri Sep 27 11:03:07 2024 +0800 1 commit 8809cc1975b7b2593ac58d1b94812cf79efb4199 Author: yangzhq68909 <993367776@qq.com> Date: Thu Sep 26 12:06:47 2024 +0800 本地登录页面 请假类型选择 commit f9432900bd16a59bf09ead042d8feb5f2212ea73 Author: yangzhq68909 <993367776@qq.com> Date: Tue Sep 24 17:23:37 2024 +0800 1 commit c9a320ddfd27e30dced5b637cc38a1f9dfd26838 Author: yangzhq68909 <993367776@qq.com> Date: Tue Sep 24 17:21:34 2024 +0800 请假流程2.0 commit e7bcd4328d75946533ebea0dc279360f26ebcbc5 Author: yangzhq68909 <993367776@qq.com> Date: Thu Sep 19 16:13:33 2024 +0800 修改接口 commit 267ba082f0134a3355b87e8dc20b02d5354552f1 Author: yangzhq68909 <993367776@qq.com> Date: Thu Sep 19 15:12:58 2024 +0800 修改api接口路径 commit 27c163736de6d9323ccd48aabfec258e75486b34 Author: jiang <358254771@qq.com> Date: Sat Sep 14 10:26:50 2024 +0800 数智产销APP第一版。 commit 14d99971604d13b84f43b4bc7c69394c403dffe7 Author: jiang wen <358254771@qq.com> Date: Sat Sep 14 10:24:54 2024 +0800 Update README.md
2025-01-21 06:13:49 +00:00
rress[i].xllb = "第一学历"
xlxxList.value.push(rress[i])
2025-01-22 14:29:32 +00:00
Squashed commit of the following: commit c6612d254bf22bd677afc3d15ac9175e48f03efa 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 f4d737e827a788e30e091ef3c5002179fa030761 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 90584edaf966c5ca58b02847f4afe443a1ad9551 Author: 闵 年泽 <627844378@qq.com> Date: Fri Jan 17 16:29:01 2025 +0800 Squashed commit of the following: commit 26ee39e9e038027ea7fa4c740b989b69380660c3 Author: yangzhq68909 <993367776@qq.com> Date: Fri Jan 17 13:48:45 2025 +0800 首页值班跳转路径 commit 0eb5fa4f51f6dfd535f24dc846e061c317cc346a Author: yangzhq68909 <993367776@qq.com> Date: Mon Jan 13 08:44:08 2025 +0800 修改流程节点开始结束中文 commit d11c9c13f21966d683108ea2e1fd723c31a40dcc 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 5be34bd5789536bbaabf0ada35dffe977b8673cd Author: yangzhq68909 <993367776@qq.com> Date: Mon Jan 13 08:24:57 2025 +0800 将流程信息开始结束节点改成中文 commit f5e9d1e611d95b5c987bd2bf104d04ae24e1b12c Author: ldeyun <ldeyun@163.com> Date: Sun Jan 12 18:49:20 2025 +0800 添加uni-modules组件,departSelect commit 23e4f9f409251fe756c192466cd1bd555c3875bd Author: yangzhq68909 <993367776@qq.com> Date: Tue Jan 7 09:44:59 2025 +0800 1 commit a472d67520f26c10b023bf1f9c79257be4140fe4 Author: yangzhq68909 <993367776@qq.com> Date: Mon Jan 6 10:44:29 2025 +0800 请假有效日期范围限制 commit 6054db8315ee657326f5201001c3c9f9c061862e Author: yangzhq68909 <993367776@qq.com> Date: Mon Dec 16 11:40:20 2024 +0800 1 commit 157249f2c660d084f386396134c578d8908fe580 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 ed007cbaf6262d77586034ad3d96698c5540edc9 Author: yangzhq68909 <993367776@qq.com> Date: Fri Dec 6 09:00:15 2024 +0800 请假获取部门修改 commit 20ba06b4f1bbfa66efc88c4e3d63cc894235e416 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 fe7a52cfeff72f37421e6ec81bca398e7da4aabb Author: jiang <358254771@qq.com> Date: Wed Dec 4 17:00:37 2024 +0800 忽略打包文件 commit 3794abbafc31c13ec6f7783e8cdd809a41010142 Author: jiang <358254771@qq.com> Date: Wed Dec 4 16:52:44 2024 +0800 和 commit af4b1b6c0ad3065172698e479fcd0b55f423d7d7 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 ecc98b14a2f6947f947ccb9aa87b48efe0358feb Author: mnz <627844378@qq.com> Date: Wed Dec 4 11:10:13 2024 +0800 修改h5 commit 4c1f42de565aff9837b246029659dae144a3bb11 Author: mnz <627844378@qq.com> Date: Wed Dec 4 11:05:49 2024 +0800 1.修改app h5 commit c9ad71fe35c51270b267ea16a04cdcb6856ba4af Author: jiang <358254771@qq.com> Date: Tue Dec 3 14:08:45 2024 +0800 发布 commit ba291f2d6116ef7843ce41642a87222edd03592c Author: yangzhq68909 <993367776@qq.com> Date: Tue Dec 3 10:52:17 2024 +0800 denglu commit 1ca340b23cc0016c947eb9b7bb83df06cfe39a89 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 0e7e8f3a8d879f5fe96fec535d55f30c4ec30aa2 Author: yangzhq68909 <993367776@qq.com> Date: Tue Nov 26 08:39:05 2024 +0800 忽略unpackage文件,jiang commit a252f9b88bd27abcdc826e21d0c2bcac28da25f3 Author: yangzhq68909 <993367776@qq.com> Date: Tue Nov 12 16:16:01 2024 +0800 修改请假页面 commit b2664417e3775d1deeb67daafea8afd09eba8ff2 Author: yangzhq68909 <993367776@qq.com> Date: Tue Nov 12 14:42:02 2024 +0800 1 commit c1a112754c83e8653d975eda26a6f0636b282188 Author: yangzhq68909 <993367776@qq.com> Date: Fri Nov 8 14:17:40 2024 +0800 1 commit ccfa6e4f11596aa270fe8ec49662c8ecb2c2623a Author: yangzhq68909 <993367776@qq.com> Date: Thu Oct 31 16:38:07 2024 +0800 页面修改 commit f27c6e4ef022d5d459cec4c54d228e4865686b7f Author: yangzhq68909 <993367776@qq.com> Date: Tue Oct 29 15:34:31 2024 +0800 1 commit ba4d6ac0dd9a7925430a7b1c2611dbb6534fdb53 Author: yangzhq68909 <993367776@qq.com> Date: Tue Oct 29 08:23:20 2024 +0800 1 commit 630862178914a9f3af717d8229701851884f5bac Author: yangzhq68909 <993367776@qq.com> Date: Fri Oct 25 11:26:14 2024 +0800 1 commit 4bf243f42b914d5294dce9e735ec950402720b85 Author: yangzhq68909 <993367776@qq.com> Date: Fri Oct 25 11:02:31 2024 +0800 增加流程取回、流程作废功能 commit 60e6f2bd2fc8d5c7bb3c9f9784b681d5958b2167 Author: yangzhq68909 <993367776@qq.com> Date: Thu Oct 24 11:15:16 2024 +0800 流程签收功能 取消组任务 commit 72e1f6c02fe70475b2136facb05a09f6f3ab85f7 Author: yangzhq68909 <993367776@qq.com> Date: Tue Oct 15 08:38:47 2024 +0800 1 commit e88ce332ed5cc070c9d5da0afb0b8ae0b86b4c31 Author: yangzhq68909 <993367776@qq.com> Date: Mon Oct 14 15:46:55 2024 +0800 1 commit 1e857671cbc8332f95ce19b2ec5db204ad5bcd58 Author: yangzhq68909 <993367776@qq.com> Date: Mon Oct 14 15:22:41 2024 +0800 上传附件及回显 commit 6202ab0f4c0658aaa0ae1c0a032ad00065462bcf Author: yangzhq68909 <993367776@qq.com> Date: Mon Oct 14 08:51:28 2024 +0800 1 commit e73c24ff153e28e4b516395bc65e2e9d67c89fa5 Author: yangzhq68909 <993367776@qq.com> Date: Sat Oct 12 09:14:27 2024 +0800 11 commit 646c8016654ad49194f30845987bb088d89a75ed Author: yangzhq68909 <993367776@qq.com> Date: Sat Oct 12 08:53:10 2024 +0800 1 commit 767c647d4a964633b842c73c317a62ae9b2f98ff Author: yangzhq68909 <993367776@qq.com> Date: Thu Oct 10 16:52:10 2024 +0800 1 commit 9a9e8327f6f977a3619d8be1961deb406e354f9c Author: yangzhq68909 <993367776@qq.com> Date: Thu Oct 10 15:32:42 2024 +0800 1 commit c3eb02f52242a91982698b9964ae6195d11be6f7 Author: yangzhq68909 <993367776@qq.com> Date: Sun Sep 29 10:44:16 2024 +0800 icon修改 修改头像接口修改 commit 33666985b65f9df3a20d171e4207ec8a0175c855 Author: yangzhq68909 <993367776@qq.com> Date: Fri Sep 27 11:03:07 2024 +0800 1 commit 8809cc1975b7b2593ac58d1b94812cf79efb4199 Author: yangzhq68909 <993367776@qq.com> Date: Thu Sep 26 12:06:47 2024 +0800 本地登录页面 请假类型选择 commit f9432900bd16a59bf09ead042d8feb5f2212ea73 Author: yangzhq68909 <993367776@qq.com> Date: Tue Sep 24 17:23:37 2024 +0800 1 commit c9a320ddfd27e30dced5b637cc38a1f9dfd26838 Author: yangzhq68909 <993367776@qq.com> Date: Tue Sep 24 17:21:34 2024 +0800 请假流程2.0 commit e7bcd4328d75946533ebea0dc279360f26ebcbc5 Author: yangzhq68909 <993367776@qq.com> Date: Thu Sep 19 16:13:33 2024 +0800 修改接口 commit 267ba082f0134a3355b87e8dc20b02d5354552f1 Author: yangzhq68909 <993367776@qq.com> Date: Thu Sep 19 15:12:58 2024 +0800 修改api接口路径 commit 27c163736de6d9323ccd48aabfec258e75486b34 Author: jiang <358254771@qq.com> Date: Sat Sep 14 10:26:50 2024 +0800 数智产销APP第一版。 commit 14d99971604d13b84f43b4bc7c69394c403dffe7 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 42adfc83d0b98c39aaeb31768a00b510dbea7f21 Author: ldeyun <ldeyun@163.com> Date: Mon Jan 13 10:49:20 2025 +0800 人员统计图表页面 commit 26ee39e9e038027ea7fa4c740b989b69380660c3 Author: yangzhq68909 <993367776@qq.com> Date: Fri Jan 17 13:48:45 2025 +0800 首页值班跳转路径 commit 0eb5fa4f51f6dfd535f24dc846e061c317cc346a Author: yangzhq68909 <993367776@qq.com> Date: Mon Jan 13 08:44:08 2025 +0800 修改流程节点开始结束中文 commit d11c9c13f21966d683108ea2e1fd723c31a40dcc 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 5be34bd5789536bbaabf0ada35dffe977b8673cd Author: yangzhq68909 <993367776@qq.com> Date: Mon Jan 13 08:24:57 2025 +0800 将流程信息开始结束节点改成中文 commit 23e4f9f409251fe756c192466cd1bd555c3875bd Author: yangzhq68909 <993367776@qq.com> Date: Tue Jan 7 09:44:59 2025 +0800 1 commit a472d67520f26c10b023bf1f9c79257be4140fe4 Author: yangzhq68909 <993367776@qq.com> Date: Mon Jan 6 10:44:29 2025 +0800 请假有效日期范围限制 commit 6054db8315ee657326f5201001c3c9f9c061862e Author: yangzhq68909 <993367776@qq.com> Date: Mon Dec 16 11:40:20 2024 +0800 1 commit 157249f2c660d084f386396134c578d8908fe580 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 ed007cbaf6262d77586034ad3d96698c5540edc9 Author: yangzhq68909 <993367776@qq.com> Date: Fri Dec 6 09:00:15 2024 +0800 请假获取部门修改 commit 20ba06b4f1bbfa66efc88c4e3d63cc894235e416 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 fe7a52cfeff72f37421e6ec81bca398e7da4aabb Author: jiang <358254771@qq.com> Date: Wed Dec 4 17:00:37 2024 +0800 忽略打包文件 commit 3794abbafc31c13ec6f7783e8cdd809a41010142 Author: jiang <358254771@qq.com> Date: Wed Dec 4 16:52:44 2024 +0800 和 commit af4b1b6c0ad3065172698e479fcd0b55f423d7d7 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 ecc98b14a2f6947f947ccb9aa87b48efe0358feb Author: mnz <627844378@qq.com> Date: Wed Dec 4 11:10:13 2024 +0800 修改h5 commit 4c1f42de565aff9837b246029659dae144a3bb11 Author: mnz <627844378@qq.com> Date: Wed Dec 4 11:05:49 2024 +0800 1.修改app h5 commit c9ad71fe35c51270b267ea16a04cdcb6856ba4af Author: jiang <358254771@qq.com> Date: Tue Dec 3 14:08:45 2024 +0800 发布 commit ba291f2d6116ef7843ce41642a87222edd03592c Author: yangzhq68909 <993367776@qq.com> Date: Tue Dec 3 10:52:17 2024 +0800 denglu commit 1ca340b23cc0016c947eb9b7bb83df06cfe39a89 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 0e7e8f3a8d879f5fe96fec535d55f30c4ec30aa2 Author: yangzhq68909 <993367776@qq.com> Date: Tue Nov 26 08:39:05 2024 +0800 忽略unpackage文件,jiang commit a252f9b88bd27abcdc826e21d0c2bcac28da25f3 Author: yangzhq68909 <993367776@qq.com> Date: Tue Nov 12 16:16:01 2024 +0800 修改请假页面 commit b2664417e3775d1deeb67daafea8afd09eba8ff2 Author: yangzhq68909 <993367776@qq.com> Date: Tue Nov 12 14:42:02 2024 +0800 1 commit c1a112754c83e8653d975eda26a6f0636b282188 Author: yangzhq68909 <993367776@qq.com> Date: Fri Nov 8 14:17:40 2024 +0800 1 commit ccfa6e4f11596aa270fe8ec49662c8ecb2c2623a Author: yangzhq68909 <993367776@qq.com> Date: Thu Oct 31 16:38:07 2024 +0800 页面修改 commit f27c6e4ef022d5d459cec4c54d228e4865686b7f Author: yangzhq68909 <993367776@qq.com> Date: Tue Oct 29 15:34:31 2024 +0800 1 commit ba4d6ac0dd9a7925430a7b1c2611dbb6534fdb53 Author: yangzhq68909 <993367776@qq.com> Date: Tue Oct 29 08:23:20 2024 +0800 1 commit 630862178914a9f3af717d8229701851884f5bac Author: yangzhq68909 <993367776@qq.com> Date: Fri Oct 25 11:26:14 2024 +0800 1 commit 4bf243f42b914d5294dce9e735ec950402720b85 Author: yangzhq68909 <993367776@qq.com> Date: Fri Oct 25 11:02:31 2024 +0800 增加流程取回、流程作废功能 commit 60e6f2bd2fc8d5c7bb3c9f9784b681d5958b2167 Author: yangzhq68909 <993367776@qq.com> Date: Thu Oct 24 11:15:16 2024 +0800 流程签收功能 取消组任务 commit 72e1f6c02fe70475b2136facb05a09f6f3ab85f7 Author: yangzhq68909 <993367776@qq.com> Date: Tue Oct 15 08:38:47 2024 +0800 1 commit e88ce332ed5cc070c9d5da0afb0b8ae0b86b4c31 Author: yangzhq68909 <993367776@qq.com> Date: Mon Oct 14 15:46:55 2024 +0800 1 commit 1e857671cbc8332f95ce19b2ec5db204ad5bcd58 Author: yangzhq68909 <993367776@qq.com> Date: Mon Oct 14 15:22:41 2024 +0800 上传附件及回显 commit 6202ab0f4c0658aaa0ae1c0a032ad00065462bcf Author: yangzhq68909 <993367776@qq.com> Date: Mon Oct 14 08:51:28 2024 +0800 1 commit e73c24ff153e28e4b516395bc65e2e9d67c89fa5 Author: yangzhq68909 <993367776@qq.com> Date: Sat Oct 12 09:14:27 2024 +0800 11 commit 646c8016654ad49194f30845987bb088d89a75ed Author: yangzhq68909 <993367776@qq.com> Date: Sat Oct 12 08:53:10 2024 +0800 1 commit 767c647d4a964633b842c73c317a62ae9b2f98ff Author: yangzhq68909 <993367776@qq.com> Date: Thu Oct 10 16:52:10 2024 +0800 1 commit 9a9e8327f6f977a3619d8be1961deb406e354f9c Author: yangzhq68909 <993367776@qq.com> Date: Thu Oct 10 15:32:42 2024 +0800 1 commit c3eb02f52242a91982698b9964ae6195d11be6f7 Author: yangzhq68909 <993367776@qq.com> Date: Sun Sep 29 10:44:16 2024 +0800 icon修改 修改头像接口修改 commit 33666985b65f9df3a20d171e4207ec8a0175c855 Author: yangzhq68909 <993367776@qq.com> Date: Fri Sep 27 11:03:07 2024 +0800 1 commit 8809cc1975b7b2593ac58d1b94812cf79efb4199 Author: yangzhq68909 <993367776@qq.com> Date: Thu Sep 26 12:06:47 2024 +0800 本地登录页面 请假类型选择 commit f9432900bd16a59bf09ead042d8feb5f2212ea73 Author: yangzhq68909 <993367776@qq.com> Date: Tue Sep 24 17:23:37 2024 +0800 1 commit c9a320ddfd27e30dced5b637cc38a1f9dfd26838 Author: yangzhq68909 <993367776@qq.com> Date: Tue Sep 24 17:21:34 2024 +0800 请假流程2.0 commit e7bcd4328d75946533ebea0dc279360f26ebcbc5 Author: yangzhq68909 <993367776@qq.com> Date: Thu Sep 19 16:13:33 2024 +0800 修改接口 commit 267ba082f0134a3355b87e8dc20b02d5354552f1 Author: yangzhq68909 <993367776@qq.com> Date: Thu Sep 19 15:12:58 2024 +0800 修改api接口路径 commit 27c163736de6d9323ccd48aabfec258e75486b34 Author: jiang <358254771@qq.com> Date: Sat Sep 14 10:26:50 2024 +0800 数智产销APP第一版。 commit 14d99971604d13b84f43b4bc7c69394c403dffe7 Author: jiang wen <358254771@qq.com> Date: Sat Sep 14 10:24:54 2024 +0800 Update README.md
2025-01-21 06:13:49 +00:00
}
2025-01-22 14:29:32 +00:00
if (rress[i].onexl != 1 & rress[i].zgxl == 1) {
Squashed commit of the following: commit c6612d254bf22bd677afc3d15ac9175e48f03efa 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 f4d737e827a788e30e091ef3c5002179fa030761 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 90584edaf966c5ca58b02847f4afe443a1ad9551 Author: 闵 年泽 <627844378@qq.com> Date: Fri Jan 17 16:29:01 2025 +0800 Squashed commit of the following: commit 26ee39e9e038027ea7fa4c740b989b69380660c3 Author: yangzhq68909 <993367776@qq.com> Date: Fri Jan 17 13:48:45 2025 +0800 首页值班跳转路径 commit 0eb5fa4f51f6dfd535f24dc846e061c317cc346a Author: yangzhq68909 <993367776@qq.com> Date: Mon Jan 13 08:44:08 2025 +0800 修改流程节点开始结束中文 commit d11c9c13f21966d683108ea2e1fd723c31a40dcc 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 5be34bd5789536bbaabf0ada35dffe977b8673cd Author: yangzhq68909 <993367776@qq.com> Date: Mon Jan 13 08:24:57 2025 +0800 将流程信息开始结束节点改成中文 commit f5e9d1e611d95b5c987bd2bf104d04ae24e1b12c Author: ldeyun <ldeyun@163.com> Date: Sun Jan 12 18:49:20 2025 +0800 添加uni-modules组件,departSelect commit 23e4f9f409251fe756c192466cd1bd555c3875bd Author: yangzhq68909 <993367776@qq.com> Date: Tue Jan 7 09:44:59 2025 +0800 1 commit a472d67520f26c10b023bf1f9c79257be4140fe4 Author: yangzhq68909 <993367776@qq.com> Date: Mon Jan 6 10:44:29 2025 +0800 请假有效日期范围限制 commit 6054db8315ee657326f5201001c3c9f9c061862e Author: yangzhq68909 <993367776@qq.com> Date: Mon Dec 16 11:40:20 2024 +0800 1 commit 157249f2c660d084f386396134c578d8908fe580 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 ed007cbaf6262d77586034ad3d96698c5540edc9 Author: yangzhq68909 <993367776@qq.com> Date: Fri Dec 6 09:00:15 2024 +0800 请假获取部门修改 commit 20ba06b4f1bbfa66efc88c4e3d63cc894235e416 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 fe7a52cfeff72f37421e6ec81bca398e7da4aabb Author: jiang <358254771@qq.com> Date: Wed Dec 4 17:00:37 2024 +0800 忽略打包文件 commit 3794abbafc31c13ec6f7783e8cdd809a41010142 Author: jiang <358254771@qq.com> Date: Wed Dec 4 16:52:44 2024 +0800 和 commit af4b1b6c0ad3065172698e479fcd0b55f423d7d7 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 ecc98b14a2f6947f947ccb9aa87b48efe0358feb Author: mnz <627844378@qq.com> Date: Wed Dec 4 11:10:13 2024 +0800 修改h5 commit 4c1f42de565aff9837b246029659dae144a3bb11 Author: mnz <627844378@qq.com> Date: Wed Dec 4 11:05:49 2024 +0800 1.修改app h5 commit c9ad71fe35c51270b267ea16a04cdcb6856ba4af Author: jiang <358254771@qq.com> Date: Tue Dec 3 14:08:45 2024 +0800 发布 commit ba291f2d6116ef7843ce41642a87222edd03592c Author: yangzhq68909 <993367776@qq.com> Date: Tue Dec 3 10:52:17 2024 +0800 denglu commit 1ca340b23cc0016c947eb9b7bb83df06cfe39a89 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 0e7e8f3a8d879f5fe96fec535d55f30c4ec30aa2 Author: yangzhq68909 <993367776@qq.com> Date: Tue Nov 26 08:39:05 2024 +0800 忽略unpackage文件,jiang commit a252f9b88bd27abcdc826e21d0c2bcac28da25f3 Author: yangzhq68909 <993367776@qq.com> Date: Tue Nov 12 16:16:01 2024 +0800 修改请假页面 commit b2664417e3775d1deeb67daafea8afd09eba8ff2 Author: yangzhq68909 <993367776@qq.com> Date: Tue Nov 12 14:42:02 2024 +0800 1 commit c1a112754c83e8653d975eda26a6f0636b282188 Author: yangzhq68909 <993367776@qq.com> Date: Fri Nov 8 14:17:40 2024 +0800 1 commit ccfa6e4f11596aa270fe8ec49662c8ecb2c2623a Author: yangzhq68909 <993367776@qq.com> Date: Thu Oct 31 16:38:07 2024 +0800 页面修改 commit f27c6e4ef022d5d459cec4c54d228e4865686b7f Author: yangzhq68909 <993367776@qq.com> Date: Tue Oct 29 15:34:31 2024 +0800 1 commit ba4d6ac0dd9a7925430a7b1c2611dbb6534fdb53 Author: yangzhq68909 <993367776@qq.com> Date: Tue Oct 29 08:23:20 2024 +0800 1 commit 630862178914a9f3af717d8229701851884f5bac Author: yangzhq68909 <993367776@qq.com> Date: Fri Oct 25 11:26:14 2024 +0800 1 commit 4bf243f42b914d5294dce9e735ec950402720b85 Author: yangzhq68909 <993367776@qq.com> Date: Fri Oct 25 11:02:31 2024 +0800 增加流程取回、流程作废功能 commit 60e6f2bd2fc8d5c7bb3c9f9784b681d5958b2167 Author: yangzhq68909 <993367776@qq.com> Date: Thu Oct 24 11:15:16 2024 +0800 流程签收功能 取消组任务 commit 72e1f6c02fe70475b2136facb05a09f6f3ab85f7 Author: yangzhq68909 <993367776@qq.com> Date: Tue Oct 15 08:38:47 2024 +0800 1 commit e88ce332ed5cc070c9d5da0afb0b8ae0b86b4c31 Author: yangzhq68909 <993367776@qq.com> Date: Mon Oct 14 15:46:55 2024 +0800 1 commit 1e857671cbc8332f95ce19b2ec5db204ad5bcd58 Author: yangzhq68909 <993367776@qq.com> Date: Mon Oct 14 15:22:41 2024 +0800 上传附件及回显 commit 6202ab0f4c0658aaa0ae1c0a032ad00065462bcf Author: yangzhq68909 <993367776@qq.com> Date: Mon Oct 14 08:51:28 2024 +0800 1 commit e73c24ff153e28e4b516395bc65e2e9d67c89fa5 Author: yangzhq68909 <993367776@qq.com> Date: Sat Oct 12 09:14:27 2024 +0800 11 commit 646c8016654ad49194f30845987bb088d89a75ed Author: yangzhq68909 <993367776@qq.com> Date: Sat Oct 12 08:53:10 2024 +0800 1 commit 767c647d4a964633b842c73c317a62ae9b2f98ff Author: yangzhq68909 <993367776@qq.com> Date: Thu Oct 10 16:52:10 2024 +0800 1 commit 9a9e8327f6f977a3619d8be1961deb406e354f9c Author: yangzhq68909 <993367776@qq.com> Date: Thu Oct 10 15:32:42 2024 +0800 1 commit c3eb02f52242a91982698b9964ae6195d11be6f7 Author: yangzhq68909 <993367776@qq.com> Date: Sun Sep 29 10:44:16 2024 +0800 icon修改 修改头像接口修改 commit 33666985b65f9df3a20d171e4207ec8a0175c855 Author: yangzhq68909 <993367776@qq.com> Date: Fri Sep 27 11:03:07 2024 +0800 1 commit 8809cc1975b7b2593ac58d1b94812cf79efb4199 Author: yangzhq68909 <993367776@qq.com> Date: Thu Sep 26 12:06:47 2024 +0800 本地登录页面 请假类型选择 commit f9432900bd16a59bf09ead042d8feb5f2212ea73 Author: yangzhq68909 <993367776@qq.com> Date: Tue Sep 24 17:23:37 2024 +0800 1 commit c9a320ddfd27e30dced5b637cc38a1f9dfd26838 Author: yangzhq68909 <993367776@qq.com> Date: Tue Sep 24 17:21:34 2024 +0800 请假流程2.0 commit e7bcd4328d75946533ebea0dc279360f26ebcbc5 Author: yangzhq68909 <993367776@qq.com> Date: Thu Sep 19 16:13:33 2024 +0800 修改接口 commit 267ba082f0134a3355b87e8dc20b02d5354552f1 Author: yangzhq68909 <993367776@qq.com> Date: Thu Sep 19 15:12:58 2024 +0800 修改api接口路径 commit 27c163736de6d9323ccd48aabfec258e75486b34 Author: jiang <358254771@qq.com> Date: Sat Sep 14 10:26:50 2024 +0800 数智产销APP第一版。 commit 14d99971604d13b84f43b4bc7c69394c403dffe7 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 42adfc83d0b98c39aaeb31768a00b510dbea7f21 Author: ldeyun <ldeyun@163.com> Date: Mon Jan 13 10:49:20 2025 +0800 人员统计图表页面 commit 26ee39e9e038027ea7fa4c740b989b69380660c3 Author: yangzhq68909 <993367776@qq.com> Date: Fri Jan 17 13:48:45 2025 +0800 首页值班跳转路径 commit 0eb5fa4f51f6dfd535f24dc846e061c317cc346a Author: yangzhq68909 <993367776@qq.com> Date: Mon Jan 13 08:44:08 2025 +0800 修改流程节点开始结束中文 commit d11c9c13f21966d683108ea2e1fd723c31a40dcc 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 5be34bd5789536bbaabf0ada35dffe977b8673cd Author: yangzhq68909 <993367776@qq.com> Date: Mon Jan 13 08:24:57 2025 +0800 将流程信息开始结束节点改成中文 commit 23e4f9f409251fe756c192466cd1bd555c3875bd Author: yangzhq68909 <993367776@qq.com> Date: Tue Jan 7 09:44:59 2025 +0800 1 commit a472d67520f26c10b023bf1f9c79257be4140fe4 Author: yangzhq68909 <993367776@qq.com> Date: Mon Jan 6 10:44:29 2025 +0800 请假有效日期范围限制 commit 6054db8315ee657326f5201001c3c9f9c061862e Author: yangzhq68909 <993367776@qq.com> Date: Mon Dec 16 11:40:20 2024 +0800 1 commit 157249f2c660d084f386396134c578d8908fe580 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 ed007cbaf6262d77586034ad3d96698c5540edc9 Author: yangzhq68909 <993367776@qq.com> Date: Fri Dec 6 09:00:15 2024 +0800 请假获取部门修改 commit 20ba06b4f1bbfa66efc88c4e3d63cc894235e416 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 fe7a52cfeff72f37421e6ec81bca398e7da4aabb Author: jiang <358254771@qq.com> Date: Wed Dec 4 17:00:37 2024 +0800 忽略打包文件 commit 3794abbafc31c13ec6f7783e8cdd809a41010142 Author: jiang <358254771@qq.com> Date: Wed Dec 4 16:52:44 2024 +0800 和 commit af4b1b6c0ad3065172698e479fcd0b55f423d7d7 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 ecc98b14a2f6947f947ccb9aa87b48efe0358feb Author: mnz <627844378@qq.com> Date: Wed Dec 4 11:10:13 2024 +0800 修改h5 commit 4c1f42de565aff9837b246029659dae144a3bb11 Author: mnz <627844378@qq.com> Date: Wed Dec 4 11:05:49 2024 +0800 1.修改app h5 commit c9ad71fe35c51270b267ea16a04cdcb6856ba4af Author: jiang <358254771@qq.com> Date: Tue Dec 3 14:08:45 2024 +0800 发布 commit ba291f2d6116ef7843ce41642a87222edd03592c Author: yangzhq68909 <993367776@qq.com> Date: Tue Dec 3 10:52:17 2024 +0800 denglu commit 1ca340b23cc0016c947eb9b7bb83df06cfe39a89 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 0e7e8f3a8d879f5fe96fec535d55f30c4ec30aa2 Author: yangzhq68909 <993367776@qq.com> Date: Tue Nov 26 08:39:05 2024 +0800 忽略unpackage文件,jiang commit a252f9b88bd27abcdc826e21d0c2bcac28da25f3 Author: yangzhq68909 <993367776@qq.com> Date: Tue Nov 12 16:16:01 2024 +0800 修改请假页面 commit b2664417e3775d1deeb67daafea8afd09eba8ff2 Author: yangzhq68909 <993367776@qq.com> Date: Tue Nov 12 14:42:02 2024 +0800 1 commit c1a112754c83e8653d975eda26a6f0636b282188 Author: yangzhq68909 <993367776@qq.com> Date: Fri Nov 8 14:17:40 2024 +0800 1 commit ccfa6e4f11596aa270fe8ec49662c8ecb2c2623a Author: yangzhq68909 <993367776@qq.com> Date: Thu Oct 31 16:38:07 2024 +0800 页面修改 commit f27c6e4ef022d5d459cec4c54d228e4865686b7f Author: yangzhq68909 <993367776@qq.com> Date: Tue Oct 29 15:34:31 2024 +0800 1 commit ba4d6ac0dd9a7925430a7b1c2611dbb6534fdb53 Author: yangzhq68909 <993367776@qq.com> Date: Tue Oct 29 08:23:20 2024 +0800 1 commit 630862178914a9f3af717d8229701851884f5bac Author: yangzhq68909 <993367776@qq.com> Date: Fri Oct 25 11:26:14 2024 +0800 1 commit 4bf243f42b914d5294dce9e735ec950402720b85 Author: yangzhq68909 <993367776@qq.com> Date: Fri Oct 25 11:02:31 2024 +0800 增加流程取回、流程作废功能 commit 60e6f2bd2fc8d5c7bb3c9f9784b681d5958b2167 Author: yangzhq68909 <993367776@qq.com> Date: Thu Oct 24 11:15:16 2024 +0800 流程签收功能 取消组任务 commit 72e1f6c02fe70475b2136facb05a09f6f3ab85f7 Author: yangzhq68909 <993367776@qq.com> Date: Tue Oct 15 08:38:47 2024 +0800 1 commit e88ce332ed5cc070c9d5da0afb0b8ae0b86b4c31 Author: yangzhq68909 <993367776@qq.com> Date: Mon Oct 14 15:46:55 2024 +0800 1 commit 1e857671cbc8332f95ce19b2ec5db204ad5bcd58 Author: yangzhq68909 <993367776@qq.com> Date: Mon Oct 14 15:22:41 2024 +0800 上传附件及回显 commit 6202ab0f4c0658aaa0ae1c0a032ad00065462bcf Author: yangzhq68909 <993367776@qq.com> Date: Mon Oct 14 08:51:28 2024 +0800 1 commit e73c24ff153e28e4b516395bc65e2e9d67c89fa5 Author: yangzhq68909 <993367776@qq.com> Date: Sat Oct 12 09:14:27 2024 +0800 11 commit 646c8016654ad49194f30845987bb088d89a75ed Author: yangzhq68909 <993367776@qq.com> Date: Sat Oct 12 08:53:10 2024 +0800 1 commit 767c647d4a964633b842c73c317a62ae9b2f98ff Author: yangzhq68909 <993367776@qq.com> Date: Thu Oct 10 16:52:10 2024 +0800 1 commit 9a9e8327f6f977a3619d8be1961deb406e354f9c Author: yangzhq68909 <993367776@qq.com> Date: Thu Oct 10 15:32:42 2024 +0800 1 commit c3eb02f52242a91982698b9964ae6195d11be6f7 Author: yangzhq68909 <993367776@qq.com> Date: Sun Sep 29 10:44:16 2024 +0800 icon修改 修改头像接口修改 commit 33666985b65f9df3a20d171e4207ec8a0175c855 Author: yangzhq68909 <993367776@qq.com> Date: Fri Sep 27 11:03:07 2024 +0800 1 commit 8809cc1975b7b2593ac58d1b94812cf79efb4199 Author: yangzhq68909 <993367776@qq.com> Date: Thu Sep 26 12:06:47 2024 +0800 本地登录页面 请假类型选择 commit f9432900bd16a59bf09ead042d8feb5f2212ea73 Author: yangzhq68909 <993367776@qq.com> Date: Tue Sep 24 17:23:37 2024 +0800 1 commit c9a320ddfd27e30dced5b637cc38a1f9dfd26838 Author: yangzhq68909 <993367776@qq.com> Date: Tue Sep 24 17:21:34 2024 +0800 请假流程2.0 commit e7bcd4328d75946533ebea0dc279360f26ebcbc5 Author: yangzhq68909 <993367776@qq.com> Date: Thu Sep 19 16:13:33 2024 +0800 修改接口 commit 267ba082f0134a3355b87e8dc20b02d5354552f1 Author: yangzhq68909 <993367776@qq.com> Date: Thu Sep 19 15:12:58 2024 +0800 修改api接口路径 commit 27c163736de6d9323ccd48aabfec258e75486b34 Author: jiang <358254771@qq.com> Date: Sat Sep 14 10:26:50 2024 +0800 数智产销APP第一版。 commit 14d99971604d13b84f43b4bc7c69394c403dffe7 Author: jiang wen <358254771@qq.com> Date: Sat Sep 14 10:24:54 2024 +0800 Update README.md
2025-01-21 06:13:49 +00:00
rress[i].xllb = "最高学历"
xlxxList.value.push(rress[i])
}
}
2025-01-22 14:29:32 +00:00
}
Squashed commit of the following: commit c6612d254bf22bd677afc3d15ac9175e48f03efa 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 f4d737e827a788e30e091ef3c5002179fa030761 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 90584edaf966c5ca58b02847f4afe443a1ad9551 Author: 闵 年泽 <627844378@qq.com> Date: Fri Jan 17 16:29:01 2025 +0800 Squashed commit of the following: commit 26ee39e9e038027ea7fa4c740b989b69380660c3 Author: yangzhq68909 <993367776@qq.com> Date: Fri Jan 17 13:48:45 2025 +0800 首页值班跳转路径 commit 0eb5fa4f51f6dfd535f24dc846e061c317cc346a Author: yangzhq68909 <993367776@qq.com> Date: Mon Jan 13 08:44:08 2025 +0800 修改流程节点开始结束中文 commit d11c9c13f21966d683108ea2e1fd723c31a40dcc 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 5be34bd5789536bbaabf0ada35dffe977b8673cd Author: yangzhq68909 <993367776@qq.com> Date: Mon Jan 13 08:24:57 2025 +0800 将流程信息开始结束节点改成中文 commit f5e9d1e611d95b5c987bd2bf104d04ae24e1b12c Author: ldeyun <ldeyun@163.com> Date: Sun Jan 12 18:49:20 2025 +0800 添加uni-modules组件,departSelect commit 23e4f9f409251fe756c192466cd1bd555c3875bd Author: yangzhq68909 <993367776@qq.com> Date: Tue Jan 7 09:44:59 2025 +0800 1 commit a472d67520f26c10b023bf1f9c79257be4140fe4 Author: yangzhq68909 <993367776@qq.com> Date: Mon Jan 6 10:44:29 2025 +0800 请假有效日期范围限制 commit 6054db8315ee657326f5201001c3c9f9c061862e Author: yangzhq68909 <993367776@qq.com> Date: Mon Dec 16 11:40:20 2024 +0800 1 commit 157249f2c660d084f386396134c578d8908fe580 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 ed007cbaf6262d77586034ad3d96698c5540edc9 Author: yangzhq68909 <993367776@qq.com> Date: Fri Dec 6 09:00:15 2024 +0800 请假获取部门修改 commit 20ba06b4f1bbfa66efc88c4e3d63cc894235e416 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 fe7a52cfeff72f37421e6ec81bca398e7da4aabb Author: jiang <358254771@qq.com> Date: Wed Dec 4 17:00:37 2024 +0800 忽略打包文件 commit 3794abbafc31c13ec6f7783e8cdd809a41010142 Author: jiang <358254771@qq.com> Date: Wed Dec 4 16:52:44 2024 +0800 和 commit af4b1b6c0ad3065172698e479fcd0b55f423d7d7 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 ecc98b14a2f6947f947ccb9aa87b48efe0358feb Author: mnz <627844378@qq.com> Date: Wed Dec 4 11:10:13 2024 +0800 修改h5 commit 4c1f42de565aff9837b246029659dae144a3bb11 Author: mnz <627844378@qq.com> Date: Wed Dec 4 11:05:49 2024 +0800 1.修改app h5 commit c9ad71fe35c51270b267ea16a04cdcb6856ba4af Author: jiang <358254771@qq.com> Date: Tue Dec 3 14:08:45 2024 +0800 发布 commit ba291f2d6116ef7843ce41642a87222edd03592c Author: yangzhq68909 <993367776@qq.com> Date: Tue Dec 3 10:52:17 2024 +0800 denglu commit 1ca340b23cc0016c947eb9b7bb83df06cfe39a89 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 0e7e8f3a8d879f5fe96fec535d55f30c4ec30aa2 Author: yangzhq68909 <993367776@qq.com> Date: Tue Nov 26 08:39:05 2024 +0800 忽略unpackage文件,jiang commit a252f9b88bd27abcdc826e21d0c2bcac28da25f3 Author: yangzhq68909 <993367776@qq.com> Date: Tue Nov 12 16:16:01 2024 +0800 修改请假页面 commit b2664417e3775d1deeb67daafea8afd09eba8ff2 Author: yangzhq68909 <993367776@qq.com> Date: Tue Nov 12 14:42:02 2024 +0800 1 commit c1a112754c83e8653d975eda26a6f0636b282188 Author: yangzhq68909 <993367776@qq.com> Date: Fri Nov 8 14:17:40 2024 +0800 1 commit ccfa6e4f11596aa270fe8ec49662c8ecb2c2623a Author: yangzhq68909 <993367776@qq.com> Date: Thu Oct 31 16:38:07 2024 +0800 页面修改 commit f27c6e4ef022d5d459cec4c54d228e4865686b7f Author: yangzhq68909 <993367776@qq.com> Date: Tue Oct 29 15:34:31 2024 +0800 1 commit ba4d6ac0dd9a7925430a7b1c2611dbb6534fdb53 Author: yangzhq68909 <993367776@qq.com> Date: Tue Oct 29 08:23:20 2024 +0800 1 commit 630862178914a9f3af717d8229701851884f5bac Author: yangzhq68909 <993367776@qq.com> Date: Fri Oct 25 11:26:14 2024 +0800 1 commit 4bf243f42b914d5294dce9e735ec950402720b85 Author: yangzhq68909 <993367776@qq.com> Date: Fri Oct 25 11:02:31 2024 +0800 增加流程取回、流程作废功能 commit 60e6f2bd2fc8d5c7bb3c9f9784b681d5958b2167 Author: yangzhq68909 <993367776@qq.com> Date: Thu Oct 24 11:15:16 2024 +0800 流程签收功能 取消组任务 commit 72e1f6c02fe70475b2136facb05a09f6f3ab85f7 Author: yangzhq68909 <993367776@qq.com> Date: Tue Oct 15 08:38:47 2024 +0800 1 commit e88ce332ed5cc070c9d5da0afb0b8ae0b86b4c31 Author: yangzhq68909 <993367776@qq.com> Date: Mon Oct 14 15:46:55 2024 +0800 1 commit 1e857671cbc8332f95ce19b2ec5db204ad5bcd58 Author: yangzhq68909 <993367776@qq.com> Date: Mon Oct 14 15:22:41 2024 +0800 上传附件及回显 commit 6202ab0f4c0658aaa0ae1c0a032ad00065462bcf Author: yangzhq68909 <993367776@qq.com> Date: Mon Oct 14 08:51:28 2024 +0800 1 commit e73c24ff153e28e4b516395bc65e2e9d67c89fa5 Author: yangzhq68909 <993367776@qq.com> Date: Sat Oct 12 09:14:27 2024 +0800 11 commit 646c8016654ad49194f30845987bb088d89a75ed Author: yangzhq68909 <993367776@qq.com> Date: Sat Oct 12 08:53:10 2024 +0800 1 commit 767c647d4a964633b842c73c317a62ae9b2f98ff Author: yangzhq68909 <993367776@qq.com> Date: Thu Oct 10 16:52:10 2024 +0800 1 commit 9a9e8327f6f977a3619d8be1961deb406e354f9c Author: yangzhq68909 <993367776@qq.com> Date: Thu Oct 10 15:32:42 2024 +0800 1 commit c3eb02f52242a91982698b9964ae6195d11be6f7 Author: yangzhq68909 <993367776@qq.com> Date: Sun Sep 29 10:44:16 2024 +0800 icon修改 修改头像接口修改 commit 33666985b65f9df3a20d171e4207ec8a0175c855 Author: yangzhq68909 <993367776@qq.com> Date: Fri Sep 27 11:03:07 2024 +0800 1 commit 8809cc1975b7b2593ac58d1b94812cf79efb4199 Author: yangzhq68909 <993367776@qq.com> Date: Thu Sep 26 12:06:47 2024 +0800 本地登录页面 请假类型选择 commit f9432900bd16a59bf09ead042d8feb5f2212ea73 Author: yangzhq68909 <993367776@qq.com> Date: Tue Sep 24 17:23:37 2024 +0800 1 commit c9a320ddfd27e30dced5b637cc38a1f9dfd26838 Author: yangzhq68909 <993367776@qq.com> Date: Tue Sep 24 17:21:34 2024 +0800 请假流程2.0 commit e7bcd4328d75946533ebea0dc279360f26ebcbc5 Author: yangzhq68909 <993367776@qq.com> Date: Thu Sep 19 16:13:33 2024 +0800 修改接口 commit 267ba082f0134a3355b87e8dc20b02d5354552f1 Author: yangzhq68909 <993367776@qq.com> Date: Thu Sep 19 15:12:58 2024 +0800 修改api接口路径 commit 27c163736de6d9323ccd48aabfec258e75486b34 Author: jiang <358254771@qq.com> Date: Sat Sep 14 10:26:50 2024 +0800 数智产销APP第一版。 commit 14d99971604d13b84f43b4bc7c69394c403dffe7 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 42adfc83d0b98c39aaeb31768a00b510dbea7f21 Author: ldeyun <ldeyun@163.com> Date: Mon Jan 13 10:49:20 2025 +0800 人员统计图表页面 commit 26ee39e9e038027ea7fa4c740b989b69380660c3 Author: yangzhq68909 <993367776@qq.com> Date: Fri Jan 17 13:48:45 2025 +0800 首页值班跳转路径 commit 0eb5fa4f51f6dfd535f24dc846e061c317cc346a Author: yangzhq68909 <993367776@qq.com> Date: Mon Jan 13 08:44:08 2025 +0800 修改流程节点开始结束中文 commit d11c9c13f21966d683108ea2e1fd723c31a40dcc 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 5be34bd5789536bbaabf0ada35dffe977b8673cd Author: yangzhq68909 <993367776@qq.com> Date: Mon Jan 13 08:24:57 2025 +0800 将流程信息开始结束节点改成中文 commit 23e4f9f409251fe756c192466cd1bd555c3875bd Author: yangzhq68909 <993367776@qq.com> Date: Tue Jan 7 09:44:59 2025 +0800 1 commit a472d67520f26c10b023bf1f9c79257be4140fe4 Author: yangzhq68909 <993367776@qq.com> Date: Mon Jan 6 10:44:29 2025 +0800 请假有效日期范围限制 commit 6054db8315ee657326f5201001c3c9f9c061862e Author: yangzhq68909 <993367776@qq.com> Date: Mon Dec 16 11:40:20 2024 +0800 1 commit 157249f2c660d084f386396134c578d8908fe580 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 ed007cbaf6262d77586034ad3d96698c5540edc9 Author: yangzhq68909 <993367776@qq.com> Date: Fri Dec 6 09:00:15 2024 +0800 请假获取部门修改 commit 20ba06b4f1bbfa66efc88c4e3d63cc894235e416 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 fe7a52cfeff72f37421e6ec81bca398e7da4aabb Author: jiang <358254771@qq.com> Date: Wed Dec 4 17:00:37 2024 +0800 忽略打包文件 commit 3794abbafc31c13ec6f7783e8cdd809a41010142 Author: jiang <358254771@qq.com> Date: Wed Dec 4 16:52:44 2024 +0800 和 commit af4b1b6c0ad3065172698e479fcd0b55f423d7d7 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 ecc98b14a2f6947f947ccb9aa87b48efe0358feb Author: mnz <627844378@qq.com> Date: Wed Dec 4 11:10:13 2024 +0800 修改h5 commit 4c1f42de565aff9837b246029659dae144a3bb11 Author: mnz <627844378@qq.com> Date: Wed Dec 4 11:05:49 2024 +0800 1.修改app h5 commit c9ad71fe35c51270b267ea16a04cdcb6856ba4af Author: jiang <358254771@qq.com> Date: Tue Dec 3 14:08:45 2024 +0800 发布 commit ba291f2d6116ef7843ce41642a87222edd03592c Author: yangzhq68909 <993367776@qq.com> Date: Tue Dec 3 10:52:17 2024 +0800 denglu commit 1ca340b23cc0016c947eb9b7bb83df06cfe39a89 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 0e7e8f3a8d879f5fe96fec535d55f30c4ec30aa2 Author: yangzhq68909 <993367776@qq.com> Date: Tue Nov 26 08:39:05 2024 +0800 忽略unpackage文件,jiang commit a252f9b88bd27abcdc826e21d0c2bcac28da25f3 Author: yangzhq68909 <993367776@qq.com> Date: Tue Nov 12 16:16:01 2024 +0800 修改请假页面 commit b2664417e3775d1deeb67daafea8afd09eba8ff2 Author: yangzhq68909 <993367776@qq.com> Date: Tue Nov 12 14:42:02 2024 +0800 1 commit c1a112754c83e8653d975eda26a6f0636b282188 Author: yangzhq68909 <993367776@qq.com> Date: Fri Nov 8 14:17:40 2024 +0800 1 commit ccfa6e4f11596aa270fe8ec49662c8ecb2c2623a Author: yangzhq68909 <993367776@qq.com> Date: Thu Oct 31 16:38:07 2024 +0800 页面修改 commit f27c6e4ef022d5d459cec4c54d228e4865686b7f Author: yangzhq68909 <993367776@qq.com> Date: Tue Oct 29 15:34:31 2024 +0800 1 commit ba4d6ac0dd9a7925430a7b1c2611dbb6534fdb53 Author: yangzhq68909 <993367776@qq.com> Date: Tue Oct 29 08:23:20 2024 +0800 1 commit 630862178914a9f3af717d8229701851884f5bac Author: yangzhq68909 <993367776@qq.com> Date: Fri Oct 25 11:26:14 2024 +0800 1 commit 4bf243f42b914d5294dce9e735ec950402720b85 Author: yangzhq68909 <993367776@qq.com> Date: Fri Oct 25 11:02:31 2024 +0800 增加流程取回、流程作废功能 commit 60e6f2bd2fc8d5c7bb3c9f9784b681d5958b2167 Author: yangzhq68909 <993367776@qq.com> Date: Thu Oct 24 11:15:16 2024 +0800 流程签收功能 取消组任务 commit 72e1f6c02fe70475b2136facb05a09f6f3ab85f7 Author: yangzhq68909 <993367776@qq.com> Date: Tue Oct 15 08:38:47 2024 +0800 1 commit e88ce332ed5cc070c9d5da0afb0b8ae0b86b4c31 Author: yangzhq68909 <993367776@qq.com> Date: Mon Oct 14 15:46:55 2024 +0800 1 commit 1e857671cbc8332f95ce19b2ec5db204ad5bcd58 Author: yangzhq68909 <993367776@qq.com> Date: Mon Oct 14 15:22:41 2024 +0800 上传附件及回显 commit 6202ab0f4c0658aaa0ae1c0a032ad00065462bcf Author: yangzhq68909 <993367776@qq.com> Date: Mon Oct 14 08:51:28 2024 +0800 1 commit e73c24ff153e28e4b516395bc65e2e9d67c89fa5 Author: yangzhq68909 <993367776@qq.com> Date: Sat Oct 12 09:14:27 2024 +0800 11 commit 646c8016654ad49194f30845987bb088d89a75ed Author: yangzhq68909 <993367776@qq.com> Date: Sat Oct 12 08:53:10 2024 +0800 1 commit 767c647d4a964633b842c73c317a62ae9b2f98ff Author: yangzhq68909 <993367776@qq.com> Date: Thu Oct 10 16:52:10 2024 +0800 1 commit 9a9e8327f6f977a3619d8be1961deb406e354f9c Author: yangzhq68909 <993367776@qq.com> Date: Thu Oct 10 15:32:42 2024 +0800 1 commit c3eb02f52242a91982698b9964ae6195d11be6f7 Author: yangzhq68909 <993367776@qq.com> Date: Sun Sep 29 10:44:16 2024 +0800 icon修改 修改头像接口修改 commit 33666985b65f9df3a20d171e4207ec8a0175c855 Author: yangzhq68909 <993367776@qq.com> Date: Fri Sep 27 11:03:07 2024 +0800 1 commit 8809cc1975b7b2593ac58d1b94812cf79efb4199 Author: yangzhq68909 <993367776@qq.com> Date: Thu Sep 26 12:06:47 2024 +0800 本地登录页面 请假类型选择 commit f9432900bd16a59bf09ead042d8feb5f2212ea73 Author: yangzhq68909 <993367776@qq.com> Date: Tue Sep 24 17:23:37 2024 +0800 1 commit c9a320ddfd27e30dced5b637cc38a1f9dfd26838 Author: yangzhq68909 <993367776@qq.com> Date: Tue Sep 24 17:21:34 2024 +0800 请假流程2.0 commit e7bcd4328d75946533ebea0dc279360f26ebcbc5 Author: yangzhq68909 <993367776@qq.com> Date: Thu Sep 19 16:13:33 2024 +0800 修改接口 commit 267ba082f0134a3355b87e8dc20b02d5354552f1 Author: yangzhq68909 <993367776@qq.com> Date: Thu Sep 19 15:12:58 2024 +0800 修改api接口路径 commit 27c163736de6d9323ccd48aabfec258e75486b34 Author: jiang <358254771@qq.com> Date: Sat Sep 14 10:26:50 2024 +0800 数智产销APP第一版。 commit 14d99971604d13b84f43b4bc7c69394c403dffe7 Author: jiang wen <358254771@qq.com> Date: Sat Sep 14 10:24:54 2024 +0800 Update README.md
2025-01-21 06:13:49 +00:00
}
}).catch((err) => {
console.log(err);
})
}
function getJbxx() {
cellData.value.push({
"title": "姓名",
"value": renyuanData.value.xm,
"titleSpan": 3,
"valueSpan": 3
})
cellData.value.push({
"title": "性别",
"value": renyuanData.value.xb_dictText,
"titleSpan": 3,
"valueSpan": 4
})
cellData.value.push({
"title": "出生年月",
"value": renyuanData.value.cssj,
"titleSpan": 4,
"valueSpan": 4
})
cellData.value.push({
"title": "民族",
"value": renyuanData.value.mz,
"titleSpan": 3,
"valueSpan": 3
})
cellData.value.push({
"title": "籍贯",
"value": renyuanData.value.jg,
"titleSpan": 3,
"valueSpan": 5
})
cellData.value.push({
"title": "出生地",
"value": renyuanData.value.csd,
"titleSpan": 3,
"valueSpan": 4
})
cellData.value.push({
"title": "工作时间",
"value": renyuanData.value.cjgzsj,
"titleSpan": 4,
"valueSpan": 5
})
cellData.value.push({
"title": "政治面貌",
"value": renyuanData.value.zzmm + renyuanData.value.jrsj,
"titleSpan": 4,
"valueSpan": 4
})
cellData.value.push({
"title": "现专业",
"value": "",
"titleSpan": 3,
"valueSpan": 8
})
cellData.value.push({
"title": "用工形式",
"value": renyuanData.value.rylb1_dictText,
"titleSpan": 4,
"valueSpan": 5
})
cellData.value.push({
"title": "健康状况",
"value": "",
"titleSpan": 4,
"valueSpan": 4
})
cellData.value.push({
"title": "所在单位",
"value": renyuanData.value.orgCode_dictText,
"titleSpan": 4,
"valueSpan": 6
})
cellData.value.push({
"title": "专业技术资格",
"value": gbxxList.value.zc + gbxxList.value.zcsj,
"titleSpan": 5,
"valueSpan": 7
})
cellData.value.push({
"title": "职业资格等级",
"value": zyzgdjList.value.ztgz + zyzgdjList.value.ztgzdj,
"titleSpan": 5,
"valueSpan": 7
})
cellData.value.push({
"title": "",
"value": "",
"titleSpan": 0,
"valueSpan": 0
})
cellData.value.push({
"title": "职务(岗位)",
"value": gbxxList.value.zw,
"titleSpan": 5,
"valueSpan": 7
})
cellData.value.push({
"title": "职位级别",
"value": gbxxList.value.zwcj,
"titleSpan": 5,
"valueSpan": 7
})
cellData.value.push({
"title": "",
"value": "",
"titleSpan": 0,
"valueSpan": 0
})
}
onLoad((e) => {
renyuanData.value = JSON.parse(decodeURIComponent(e.data));
ldhth.value = renyuanData.value.ldhth
getChildTable()
setTimeout(function() {
getJbxx()
}, 500);
})
</script>
<style scoped>
.renyuanInfo {
position: absolute;
bottom: 0;
left: 0;
right: 0;
top: 0;
height: 98vh;
width: 900px;
background-color: rgba($color: #000000, $alpha: 0.4);
display: flex;
flex-direction: row;
font-size: 18px;
color: #fff;
}
.titleStyle {
font-size: 12px;
color: #747474;
line-height: 50px;
height: 50px;
background: #F2F9FC;
text-align: center;
vertical-align: middle;
border-left: 1px solid #919191;
border-bottom: 1px solid #919191;
;
}
/* 内容样式 */
.dataStyle {
max-font-size: 14px;
/* 最大字体限制 */
min-font-size: 10px;
/* 最小字体限制 */
font-size: 14px;
color: #00007f;
line-height: 25px;
height: 50px;
font-weight: 500;
text-align: center;
vertical-align: middle;
border-bottom: 1px solid #919191;
border-left: 1px solid #919191;
2025-01-22 14:29:32 +00:00
text-align: center;
word-wrap: break-word;
overflow-wrap: break-word;
Squashed commit of the following: commit c6612d254bf22bd677afc3d15ac9175e48f03efa 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 f4d737e827a788e30e091ef3c5002179fa030761 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 90584edaf966c5ca58b02847f4afe443a1ad9551 Author: 闵 年泽 <627844378@qq.com> Date: Fri Jan 17 16:29:01 2025 +0800 Squashed commit of the following: commit 26ee39e9e038027ea7fa4c740b989b69380660c3 Author: yangzhq68909 <993367776@qq.com> Date: Fri Jan 17 13:48:45 2025 +0800 首页值班跳转路径 commit 0eb5fa4f51f6dfd535f24dc846e061c317cc346a Author: yangzhq68909 <993367776@qq.com> Date: Mon Jan 13 08:44:08 2025 +0800 修改流程节点开始结束中文 commit d11c9c13f21966d683108ea2e1fd723c31a40dcc 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 5be34bd5789536bbaabf0ada35dffe977b8673cd Author: yangzhq68909 <993367776@qq.com> Date: Mon Jan 13 08:24:57 2025 +0800 将流程信息开始结束节点改成中文 commit f5e9d1e611d95b5c987bd2bf104d04ae24e1b12c Author: ldeyun <ldeyun@163.com> Date: Sun Jan 12 18:49:20 2025 +0800 添加uni-modules组件,departSelect commit 23e4f9f409251fe756c192466cd1bd555c3875bd Author: yangzhq68909 <993367776@qq.com> Date: Tue Jan 7 09:44:59 2025 +0800 1 commit a472d67520f26c10b023bf1f9c79257be4140fe4 Author: yangzhq68909 <993367776@qq.com> Date: Mon Jan 6 10:44:29 2025 +0800 请假有效日期范围限制 commit 6054db8315ee657326f5201001c3c9f9c061862e Author: yangzhq68909 <993367776@qq.com> Date: Mon Dec 16 11:40:20 2024 +0800 1 commit 157249f2c660d084f386396134c578d8908fe580 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 ed007cbaf6262d77586034ad3d96698c5540edc9 Author: yangzhq68909 <993367776@qq.com> Date: Fri Dec 6 09:00:15 2024 +0800 请假获取部门修改 commit 20ba06b4f1bbfa66efc88c4e3d63cc894235e416 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 fe7a52cfeff72f37421e6ec81bca398e7da4aabb Author: jiang <358254771@qq.com> Date: Wed Dec 4 17:00:37 2024 +0800 忽略打包文件 commit 3794abbafc31c13ec6f7783e8cdd809a41010142 Author: jiang <358254771@qq.com> Date: Wed Dec 4 16:52:44 2024 +0800 和 commit af4b1b6c0ad3065172698e479fcd0b55f423d7d7 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 ecc98b14a2f6947f947ccb9aa87b48efe0358feb Author: mnz <627844378@qq.com> Date: Wed Dec 4 11:10:13 2024 +0800 修改h5 commit 4c1f42de565aff9837b246029659dae144a3bb11 Author: mnz <627844378@qq.com> Date: Wed Dec 4 11:05:49 2024 +0800 1.修改app h5 commit c9ad71fe35c51270b267ea16a04cdcb6856ba4af Author: jiang <358254771@qq.com> Date: Tue Dec 3 14:08:45 2024 +0800 发布 commit ba291f2d6116ef7843ce41642a87222edd03592c Author: yangzhq68909 <993367776@qq.com> Date: Tue Dec 3 10:52:17 2024 +0800 denglu commit 1ca340b23cc0016c947eb9b7bb83df06cfe39a89 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 0e7e8f3a8d879f5fe96fec535d55f30c4ec30aa2 Author: yangzhq68909 <993367776@qq.com> Date: Tue Nov 26 08:39:05 2024 +0800 忽略unpackage文件,jiang commit a252f9b88bd27abcdc826e21d0c2bcac28da25f3 Author: yangzhq68909 <993367776@qq.com> Date: Tue Nov 12 16:16:01 2024 +0800 修改请假页面 commit b2664417e3775d1deeb67daafea8afd09eba8ff2 Author: yangzhq68909 <993367776@qq.com> Date: Tue Nov 12 14:42:02 2024 +0800 1 commit c1a112754c83e8653d975eda26a6f0636b282188 Author: yangzhq68909 <993367776@qq.com> Date: Fri Nov 8 14:17:40 2024 +0800 1 commit ccfa6e4f11596aa270fe8ec49662c8ecb2c2623a Author: yangzhq68909 <993367776@qq.com> Date: Thu Oct 31 16:38:07 2024 +0800 页面修改 commit f27c6e4ef022d5d459cec4c54d228e4865686b7f Author: yangzhq68909 <993367776@qq.com> Date: Tue Oct 29 15:34:31 2024 +0800 1 commit ba4d6ac0dd9a7925430a7b1c2611dbb6534fdb53 Author: yangzhq68909 <993367776@qq.com> Date: Tue Oct 29 08:23:20 2024 +0800 1 commit 630862178914a9f3af717d8229701851884f5bac Author: yangzhq68909 <993367776@qq.com> Date: Fri Oct 25 11:26:14 2024 +0800 1 commit 4bf243f42b914d5294dce9e735ec950402720b85 Author: yangzhq68909 <993367776@qq.com> Date: Fri Oct 25 11:02:31 2024 +0800 增加流程取回、流程作废功能 commit 60e6f2bd2fc8d5c7bb3c9f9784b681d5958b2167 Author: yangzhq68909 <993367776@qq.com> Date: Thu Oct 24 11:15:16 2024 +0800 流程签收功能 取消组任务 commit 72e1f6c02fe70475b2136facb05a09f6f3ab85f7 Author: yangzhq68909 <993367776@qq.com> Date: Tue Oct 15 08:38:47 2024 +0800 1 commit e88ce332ed5cc070c9d5da0afb0b8ae0b86b4c31 Author: yangzhq68909 <993367776@qq.com> Date: Mon Oct 14 15:46:55 2024 +0800 1 commit 1e857671cbc8332f95ce19b2ec5db204ad5bcd58 Author: yangzhq68909 <993367776@qq.com> Date: Mon Oct 14 15:22:41 2024 +0800 上传附件及回显 commit 6202ab0f4c0658aaa0ae1c0a032ad00065462bcf Author: yangzhq68909 <993367776@qq.com> Date: Mon Oct 14 08:51:28 2024 +0800 1 commit e73c24ff153e28e4b516395bc65e2e9d67c89fa5 Author: yangzhq68909 <993367776@qq.com> Date: Sat Oct 12 09:14:27 2024 +0800 11 commit 646c8016654ad49194f30845987bb088d89a75ed Author: yangzhq68909 <993367776@qq.com> Date: Sat Oct 12 08:53:10 2024 +0800 1 commit 767c647d4a964633b842c73c317a62ae9b2f98ff Author: yangzhq68909 <993367776@qq.com> Date: Thu Oct 10 16:52:10 2024 +0800 1 commit 9a9e8327f6f977a3619d8be1961deb406e354f9c Author: yangzhq68909 <993367776@qq.com> Date: Thu Oct 10 15:32:42 2024 +0800 1 commit c3eb02f52242a91982698b9964ae6195d11be6f7 Author: yangzhq68909 <993367776@qq.com> Date: Sun Sep 29 10:44:16 2024 +0800 icon修改 修改头像接口修改 commit 33666985b65f9df3a20d171e4207ec8a0175c855 Author: yangzhq68909 <993367776@qq.com> Date: Fri Sep 27 11:03:07 2024 +0800 1 commit 8809cc1975b7b2593ac58d1b94812cf79efb4199 Author: yangzhq68909 <993367776@qq.com> Date: Thu Sep 26 12:06:47 2024 +0800 本地登录页面 请假类型选择 commit f9432900bd16a59bf09ead042d8feb5f2212ea73 Author: yangzhq68909 <993367776@qq.com> Date: Tue Sep 24 17:23:37 2024 +0800 1 commit c9a320ddfd27e30dced5b637cc38a1f9dfd26838 Author: yangzhq68909 <993367776@qq.com> Date: Tue Sep 24 17:21:34 2024 +0800 请假流程2.0 commit e7bcd4328d75946533ebea0dc279360f26ebcbc5 Author: yangzhq68909 <993367776@qq.com> Date: Thu Sep 19 16:13:33 2024 +0800 修改接口 commit 267ba082f0134a3355b87e8dc20b02d5354552f1 Author: yangzhq68909 <993367776@qq.com> Date: Thu Sep 19 15:12:58 2024 +0800 修改api接口路径 commit 27c163736de6d9323ccd48aabfec258e75486b34 Author: jiang <358254771@qq.com> Date: Sat Sep 14 10:26:50 2024 +0800 数智产销APP第一版。 commit 14d99971604d13b84f43b4bc7c69394c403dffe7 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 42adfc83d0b98c39aaeb31768a00b510dbea7f21 Author: ldeyun <ldeyun@163.com> Date: Mon Jan 13 10:49:20 2025 +0800 人员统计图表页面 commit 26ee39e9e038027ea7fa4c740b989b69380660c3 Author: yangzhq68909 <993367776@qq.com> Date: Fri Jan 17 13:48:45 2025 +0800 首页值班跳转路径 commit 0eb5fa4f51f6dfd535f24dc846e061c317cc346a Author: yangzhq68909 <993367776@qq.com> Date: Mon Jan 13 08:44:08 2025 +0800 修改流程节点开始结束中文 commit d11c9c13f21966d683108ea2e1fd723c31a40dcc 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 5be34bd5789536bbaabf0ada35dffe977b8673cd Author: yangzhq68909 <993367776@qq.com> Date: Mon Jan 13 08:24:57 2025 +0800 将流程信息开始结束节点改成中文 commit 23e4f9f409251fe756c192466cd1bd555c3875bd Author: yangzhq68909 <993367776@qq.com> Date: Tue Jan 7 09:44:59 2025 +0800 1 commit a472d67520f26c10b023bf1f9c79257be4140fe4 Author: yangzhq68909 <993367776@qq.com> Date: Mon Jan 6 10:44:29 2025 +0800 请假有效日期范围限制 commit 6054db8315ee657326f5201001c3c9f9c061862e Author: yangzhq68909 <993367776@qq.com> Date: Mon Dec 16 11:40:20 2024 +0800 1 commit 157249f2c660d084f386396134c578d8908fe580 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 ed007cbaf6262d77586034ad3d96698c5540edc9 Author: yangzhq68909 <993367776@qq.com> Date: Fri Dec 6 09:00:15 2024 +0800 请假获取部门修改 commit 20ba06b4f1bbfa66efc88c4e3d63cc894235e416 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 fe7a52cfeff72f37421e6ec81bca398e7da4aabb Author: jiang <358254771@qq.com> Date: Wed Dec 4 17:00:37 2024 +0800 忽略打包文件 commit 3794abbafc31c13ec6f7783e8cdd809a41010142 Author: jiang <358254771@qq.com> Date: Wed Dec 4 16:52:44 2024 +0800 和 commit af4b1b6c0ad3065172698e479fcd0b55f423d7d7 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 ecc98b14a2f6947f947ccb9aa87b48efe0358feb Author: mnz <627844378@qq.com> Date: Wed Dec 4 11:10:13 2024 +0800 修改h5 commit 4c1f42de565aff9837b246029659dae144a3bb11 Author: mnz <627844378@qq.com> Date: Wed Dec 4 11:05:49 2024 +0800 1.修改app h5 commit c9ad71fe35c51270b267ea16a04cdcb6856ba4af Author: jiang <358254771@qq.com> Date: Tue Dec 3 14:08:45 2024 +0800 发布 commit ba291f2d6116ef7843ce41642a87222edd03592c Author: yangzhq68909 <993367776@qq.com> Date: Tue Dec 3 10:52:17 2024 +0800 denglu commit 1ca340b23cc0016c947eb9b7bb83df06cfe39a89 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 0e7e8f3a8d879f5fe96fec535d55f30c4ec30aa2 Author: yangzhq68909 <993367776@qq.com> Date: Tue Nov 26 08:39:05 2024 +0800 忽略unpackage文件,jiang commit a252f9b88bd27abcdc826e21d0c2bcac28da25f3 Author: yangzhq68909 <993367776@qq.com> Date: Tue Nov 12 16:16:01 2024 +0800 修改请假页面 commit b2664417e3775d1deeb67daafea8afd09eba8ff2 Author: yangzhq68909 <993367776@qq.com> Date: Tue Nov 12 14:42:02 2024 +0800 1 commit c1a112754c83e8653d975eda26a6f0636b282188 Author: yangzhq68909 <993367776@qq.com> Date: Fri Nov 8 14:17:40 2024 +0800 1 commit ccfa6e4f11596aa270fe8ec49662c8ecb2c2623a Author: yangzhq68909 <993367776@qq.com> Date: Thu Oct 31 16:38:07 2024 +0800 页面修改 commit f27c6e4ef022d5d459cec4c54d228e4865686b7f Author: yangzhq68909 <993367776@qq.com> Date: Tue Oct 29 15:34:31 2024 +0800 1 commit ba4d6ac0dd9a7925430a7b1c2611dbb6534fdb53 Author: yangzhq68909 <993367776@qq.com> Date: Tue Oct 29 08:23:20 2024 +0800 1 commit 630862178914a9f3af717d8229701851884f5bac Author: yangzhq68909 <993367776@qq.com> Date: Fri Oct 25 11:26:14 2024 +0800 1 commit 4bf243f42b914d5294dce9e735ec950402720b85 Author: yangzhq68909 <993367776@qq.com> Date: Fri Oct 25 11:02:31 2024 +0800 增加流程取回、流程作废功能 commit 60e6f2bd2fc8d5c7bb3c9f9784b681d5958b2167 Author: yangzhq68909 <993367776@qq.com> Date: Thu Oct 24 11:15:16 2024 +0800 流程签收功能 取消组任务 commit 72e1f6c02fe70475b2136facb05a09f6f3ab85f7 Author: yangzhq68909 <993367776@qq.com> Date: Tue Oct 15 08:38:47 2024 +0800 1 commit e88ce332ed5cc070c9d5da0afb0b8ae0b86b4c31 Author: yangzhq68909 <993367776@qq.com> Date: Mon Oct 14 15:46:55 2024 +0800 1 commit 1e857671cbc8332f95ce19b2ec5db204ad5bcd58 Author: yangzhq68909 <993367776@qq.com> Date: Mon Oct 14 15:22:41 2024 +0800 上传附件及回显 commit 6202ab0f4c0658aaa0ae1c0a032ad00065462bcf Author: yangzhq68909 <993367776@qq.com> Date: Mon Oct 14 08:51:28 2024 +0800 1 commit e73c24ff153e28e4b516395bc65e2e9d67c89fa5 Author: yangzhq68909 <993367776@qq.com> Date: Sat Oct 12 09:14:27 2024 +0800 11 commit 646c8016654ad49194f30845987bb088d89a75ed Author: yangzhq68909 <993367776@qq.com> Date: Sat Oct 12 08:53:10 2024 +0800 1 commit 767c647d4a964633b842c73c317a62ae9b2f98ff Author: yangzhq68909 <993367776@qq.com> Date: Thu Oct 10 16:52:10 2024 +0800 1 commit 9a9e8327f6f977a3619d8be1961deb406e354f9c Author: yangzhq68909 <993367776@qq.com> Date: Thu Oct 10 15:32:42 2024 +0800 1 commit c3eb02f52242a91982698b9964ae6195d11be6f7 Author: yangzhq68909 <993367776@qq.com> Date: Sun Sep 29 10:44:16 2024 +0800 icon修改 修改头像接口修改 commit 33666985b65f9df3a20d171e4207ec8a0175c855 Author: yangzhq68909 <993367776@qq.com> Date: Fri Sep 27 11:03:07 2024 +0800 1 commit 8809cc1975b7b2593ac58d1b94812cf79efb4199 Author: yangzhq68909 <993367776@qq.com> Date: Thu Sep 26 12:06:47 2024 +0800 本地登录页面 请假类型选择 commit f9432900bd16a59bf09ead042d8feb5f2212ea73 Author: yangzhq68909 <993367776@qq.com> Date: Tue Sep 24 17:23:37 2024 +0800 1 commit c9a320ddfd27e30dced5b637cc38a1f9dfd26838 Author: yangzhq68909 <993367776@qq.com> Date: Tue Sep 24 17:21:34 2024 +0800 请假流程2.0 commit e7bcd4328d75946533ebea0dc279360f26ebcbc5 Author: yangzhq68909 <993367776@qq.com> Date: Thu Sep 19 16:13:33 2024 +0800 修改接口 commit 267ba082f0134a3355b87e8dc20b02d5354552f1 Author: yangzhq68909 <993367776@qq.com> Date: Thu Sep 19 15:12:58 2024 +0800 修改api接口路径 commit 27c163736de6d9323ccd48aabfec258e75486b34 Author: jiang <358254771@qq.com> Date: Sat Sep 14 10:26:50 2024 +0800 数智产销APP第一版。 commit 14d99971604d13b84f43b4bc7c69394c403dffe7 Author: jiang wen <358254771@qq.com> Date: Sat Sep 14 10:24:54 2024 +0800 Update README.md
2025-01-21 06:13:49 +00:00
}
</style>