|
|
7bcaf09421
|
优化生产css
|
2025-04-02 21:04:33 +08:00 |
|
|
|
9556ecb346
|
Merge branch 'master' of http://ngtools.cn:53000/ldeyun/cxc-szcx-uniapp
# Conflicts:
# pages/views/shengchan/ribaoshuju/rbsjLsxq.vue
# pages/views/shengchan/ribaoshuju/trqRbsj.vue
# uni_modules/cxc-szcx-dateRangeSelect/components/cxc-szcx-dateRangeSelect/cxc-szcx-dateRangeSelect.vue
|
2025-03-12 21:50:04 +08:00 |
|
|
|
3676301f30
|
修改生产页面的显示逻辑，增加可选
编写自定义组件的说明书
|
2025-03-12 21:45:06 +08:00 |
|
|
|
cd2291f6ba
|
基于wu-calendar 制作日期选择组件，可推广全站使用，完成天然气和污油的展示。
|
2025-03-12 17:49:45 +08:00 |
|
|
|
272c225f41
|
基于wu-calendar 制作日期选择组件，可推广全站使用。
|
2025-03-11 21:20:18 +08:00 |
|
|
|
680b26c6c1
|
Merge branch 'master' of http://ngtools.cn:53000/ldeyun/cxc-szcx-uniapp
# Conflicts:
# api/shengchan.js
# pages.json
# pages/tab/product.vue
|
2025-03-08 07:27:27 +08:00 |
|
|
|
108bbaf598
|
添加了一个tab页，添加了天然气和原油的生产日数据
|
2025-03-07 11:44:55 +08:00 |
|
|
|
aeba538e25
|
添加生产数据模块
|
2025-03-07 02:49:12 +08:00 |
|
杨哲琦
|
e1c02d2905
|
做生产数据展示页面
|
2025-03-06 17:59:17 +08:00 |
|
杨哲琦
|
e311dea069
|
Merge branch 'yzqUniapp' into 'master'
1.1.11
See merge request cxcxt/cxc-szcx-uniapp!18
|
2025-03-06 14:57:18 +08:00 |
|
yangzhq68909
|
318801231b
|
1.1.11
|
2025-03-06 14:57:38 +08:00 |
|
闵 年泽
|
0cf6f4345a
|
Merge branch 'ldeyun' into 'master'
1.修改统计
See merge request cxcxt/cxc-szcx-uniapp!17
|
2025-03-06 14:11:09 +08:00 |
|
闵 年泽
|
1a2d35292a
|
1.修改统计
|
2025-03-06 14:07:59 +08:00 |
|
yangzhq68909
|
3777616948
|
1
|
2025-03-03 18:14:23 +08:00 |
|
杨哲琦
|
4e1bc040b8
|
Merge branch 'yzqUniapp' into 'master'
Yzq uniapp
See merge request cxcxt/cxc-szcx-uniapp!16
|
2025-03-03 18:14:17 +08:00 |
|
yangzhq68909
|
6ec65c8f41
|
请假正职增加分管领导选择
|
2025-03-03 18:03:42 +08:00 |
|
杨哲琦
|
386bbe312c
|
Merge branch 'yzqUniapp' into 'master'
1.1.9
See merge request cxcxt/cxc-szcx-uniapp!15
|
2025-03-01 11:43:40 +08:00 |
|
yangzhq68909
|
4eb676bf08
|
1.1.9
|
2025-03-01 11:43:33 +08:00 |
|
杨哲琦
|
23e0dfeef6
|
Merge branch 'yzqUniapp' into 'master'
1.1.7
See merge request cxcxt/cxc-szcx-uniapp!14
|
2025-02-28 09:31:27 +08:00 |
|
yangzhq68909
|
5d7781710e
|
1.1.7
|
2025-02-28 09:31:14 +08:00 |
|
杨哲琦
|
c7474c9224
|
Merge branch 'yzqUniapp' into 'master'
时间选择改成日期选择
See merge request cxcxt/cxc-szcx-uniapp!13
|
2025-02-27 09:58:33 +08:00 |
|
yangzhq68909
|
8e803ae7cd
|
时间选择改成日期选择
|
2025-02-27 09:58:14 +08:00 |
|
杨哲琦
|
ee47eac0eb
|
Merge branch 'yzqUniapp' into 'master'
Yzq uniapp
See merge request cxcxt/cxc-szcx-uniapp!12
|
2025-02-27 09:42:32 +08:00 |
|
yangzhq68909
|
d9433307c6
|
请假信息
|
2025-02-27 09:34:41 +08:00 |
|
yangzhq68909
|
6116c47a34
|
Merge remote-tracking branch 'remotes/origin/master' into yzqUniapp
# Conflicts:
# pages.json
|
2025-02-24 15:28:56 +08:00 |
|
yangzhq68909
|
43c78904f3
|
请假信息
|
2025-02-24 15:28:03 +08:00 |
|
闵 年泽
|
0f2283a04a
|
Merge branch 'ldeyun' into 'master'
1.修改人力资源统计
See merge request cxcxt/cxc-szcx-uniapp!11
|
2025-02-19 12:50:57 +08:00 |
|
闵 年泽
|
fd23e323ee
|
1.修改人力资源统计
|
2025-02-19 12:50:03 +08:00 |
|
闵 年泽
|
421709bd29
|
Merge branch 'ldeyun' into 'master'
Ldeyun
See merge request cxcxt/cxc-szcx-uniapp!10
|
2025-02-18 14:22:21 +08:00 |
|
闵 年泽
|
ecf791270c
|
Merge remote-tracking branch 'remotes/origin/master' into ldeyun
# Conflicts:
# .env.development
# pages/views/renliziyuan/renyuanxinxi/index.vue
# pages/views/renliziyuan/renyuanxinxi/qttongji.vue
|
2025-02-18 14:21:51 +08:00 |
|
|
|
27a1f96cb2
|
修改了人员统计三个页面相关界面和逻辑，增加照片显示
|
2025-02-17 20:10:01 +08:00 |
|
|
|
cc6681cfb5
|
完善通用查询和详情界面
|
2025-02-14 14:12:21 +08:00 |
|
|
|
8cf96126fe
|
统计查询修改
|
2025-02-13 23:03:49 +08:00 |
|
|
|
9808821b70
|
Merge branch 'ldeyun' of http://ngtools.cn:53000/ldeyun/cxc-szcx-uniapp into ldeyun
# Conflicts:
# pages/views/renliziyuan/renyuanxinxi/qttongji.vue
|
2025-02-13 22:31:14 +08:00 |
|
|
|
d3878d3358
|
修改通用查询模块，增加字典API
|
2025-02-13 17:41:13 +08:00 |
|
|
|
2a746146f0
|
人员台账单位和通用字段查询初步实现，还需进一步优化，钻取列表未做。
|
2025-02-13 01:51:44 +08:00 |
|
|
|
60ce182912
|
Merge branch 'master' of http://10.75.166.171/cxcxt/cxc-szcx-uniapp
# Conflicts:
# .env.development
# pages/views/renliziyuan/renyuanxinxi/index.vue
|
2025-02-12 13:58:11 +08:00 |
|
|
|
1ef1384fa8
|
Merge branch 'master' of http://ngtools.cn:53000/ldeyun/cxc-szcx-uniapp
# Conflicts:
# .env.development
# api/renyuan.js
# manifest.json
# pages.json
# pages/views/renliziyuan/renyuanxinxi/index.vue
# pages/views/renliziyuan/renyuanxinxi/tongji.vue
|
2025-02-12 02:21:11 +08:00 |
|
闵 年泽
|
224e4578db
|
增加可配置人员统计页面
|
2025-02-11 17:22:32 +08:00 |
|
闵 年泽
|
2183aab470
|
增加可配置人员统计页面
|
2025-02-11 17:09:35 +08:00 |
|
闵 年泽
|
cedff04447
|
1.修改人员统计
|
2025-02-11 09:34:29 +08:00 |
|
闵 年泽
|
8624b29d37
|
Merge remote-tracking branch 'remotes/origin/master'
# Conflicts:
# .gitignore
# pages/views/zhongheguanli/meeting/index.vue
# pages/views/zhongheguanli/zhiban/index.vue
|
2025-02-11 09:02:31 +08:00 |
|
闵 年泽
|
3dd367c216
|
1
|
2025-02-11 09:01:27 +08:00 |
|
yangzhq68909
|
aff8d2168a
|
Merge remote-tracking branch 'remotes/origin/ldeyun' into yzqUniapp
# Conflicts:
# api/renyuan.js
# manifest.json
# pages/views/renliziyuan/renyuanxinxi/detail.vue
# pages/views/renliziyuan/renyuanxinxi/tongji.vue
|
2025-02-07 10:29:20 +08:00 |
|
yangzhq68909
|
71cdfa3116
|
修改请假日期判断
|
2025-02-07 10:26:15 +08:00 |
|
|
|
8222fdc0a4
|
完善人员年龄统计模块
|
2025-02-03 07:24:30 +08:00 |
|
yangzhq68909
|
7d871f7151
|
Merge remote-tracking branch 'remotes/origin/ldeyun' into yzqUniapp
# Conflicts:
# .env.development
# manifest.json
# package-lock.json
# pages/views/renliziyuan/renyuanxinxi/taizhang.vue
|
2025-01-23 18:00:35 +08:00 |
|
|
|
f50e2fe7ec
|
完善人员详情，增加考核信息，修改学历数据处理逻辑
|
2025-01-23 16:58:38 +08:00 |
|
闵 年泽
|
1dbe2fbd07
|
Merge branch 'ldeyun' into 'master'
Ldeyun
See merge request cxcxt/cxc-szcx-uniapp!9
|
2025-01-23 09:02:27 +08:00 |
|
闵 年泽
|
d536aaad8a
|
Merge branch 'master' into 'ldeyun'
# Conflicts:
# pages/login/login.vue
|
2025-01-23 09:02:12 +08:00 |
|
