Commit Graph

59 Commits (30be7bc70527c26cd59402f25f0d49e28e8f7c2c)

Author SHA1 Message Date
wangpeng edb4fc5c1a 调试安全通知选择人员回调问题 2024-04-10 19:54:11 +08:00
xiepeng ae3cba5fb8 BUG 优化 2024-04-10 16:53:36 +08:00
wangpeng db057467b2 补充替换CORPINFO_ID通用标识 2024-04-09 21:52:02 +08:00
wangpeng ba03a2fa12 删除统一样式
修复安全体系管理
2024-04-09 16:07:52 +08:00
wangpeng 02d7364a6e 代码格式化 2024-04-09 10:27:59 +08:00
wangpeng ce38a19607 优化人员选择 2024-04-08 20:11:06 +08:00
xiepeng edc013140f BUG 优化 2024-04-07 18:51:27 +08:00
xiepeng c57edc5b22 BUG 优化 2024-04-03 17:57:47 +08:00
xiepeng 43b9287721 BUG 优化 2024-04-02 18:52:04 +08:00
xiepeng a090f54ecf Merge remote-tracking branch 'origin/dev' into dev 2024-04-02 08:26:09 +08:00
wangpeng 57dfe8f8c5 批量屏蔽经营企业和经营类型
消除代码编译的警告、错误
2024-04-02 08:23:59 +08:00
xiepeng 83faf65bb4 BUG 优化 2024-04-01 18:55:28 +08:00
xiepeng 1306882ed0 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	src/views/enterprise_management/basics_info_management/operation_vehicle/index.vue
#	src/views/mechanical_files/inspect_annually/index.vue
2024-04-01 10:44:15 +08:00
xiepeng 3de96ec2c2 BUG 优化 2024-04-01 10:37:47 +08:00
wangpeng 8619753b0a 消除代码编译的警告、错误 2024-04-01 10:04:41 +08:00
WenShiJun 287ca601e4 Merge remote-tracking branch 'origin/dev' into dev 2024-03-30 17:42:42 +08:00
WenShiJun e7e07310bc 页面控制台警告优化 2024-03-30 17:42:01 +08:00
xiepeng 328b76dcde BUG 优化 2024-03-29 18:07:08 +08:00
xiepeng 3e709eb383 Merge remote-tracking branch 'origin/dev' into dev 2024-03-29 13:38:52 +08:00
xiepeng d77a118fc8 BUG 优化 2024-03-29 13:38:39 +08:00
WenShiJun 88b97b8037 生成安全事故档案bug优化 2024-03-29 10:48:10 +08:00
WenShiJun c57033a56f Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	src/views/mechanical_files/taxation_manage/index.vue
#	src/views/production_course_regulate/violation_registration/index.vue
2024-03-28 18:39:17 +08:00
WenShiJun 0369b0a784 bug优化 2024-03-28 18:36:17 +08:00
xiepeng 0fc9cd9a76 BUG 优化 2024-03-28 18:31:58 +08:00
xiepeng 5f167d98da Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	src/views/mechanical_files/production_accident/add.vue
2024-03-27 18:17:57 +08:00
xiepeng 3b29fb05fc BUG 优化 2024-03-27 18:09:02 +08:00
WenShiJun 5cfc44479c Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	src/views/mechanical_files/beidou/index.vue
#	src/views/mechanical_files/taxation_manage/index.vue
2024-03-27 18:08:03 +08:00
WenShiJun 301b97d4f4 bug优化 2024-03-27 18:05:30 +08:00
xiepeng 40a5fd2496 提醒天数 下拉 2024-03-27 10:02:58 +08:00
xiepeng 25680c9e26 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	src/assets/js/constant.js
2024-03-26 18:04:58 +08:00
xiepeng cfec695c81 修改车牌号、车架号、发动机号校验
图片显示
2024-03-26 18:04:04 +08:00
WenShiJun cf7e5686e4 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	src/views/enterprise_management/basics_info_management/freight_trailer/add.vue
#	src/views/enterprise_management/basics_info_management/freight_trailer/index.vue
2024-03-26 18:03:19 +08:00
WenShiJun 558799d0c9 bug优化 2024-03-26 18:02:32 +08:00
wangpeng ab68b10197 修改 名称 2024-03-25 19:02:07 +08:00
WenShiJun 4c69d2f8a7 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	src/views/mechanical_files/inspect_annually/index.vue
#	src/views/mechanical_files/insure/index.vue
#	src/views/mechanical_files/taxation_manage/add.vue
2024-03-25 11:42:37 +08:00
WenShiJun 8cfa203273 保险管理,运营管理,维保管理,北斗管理优化 2024-03-25 11:39:42 +08:00
xiepeng 8a90839b14 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	src/assets/js/constant.js
#	src/request/assigned_manage.js
#	src/request/enterprise_management.js
#	src/request/operation_vehicle.js
#	src/request/scrap_manage.js
#	src/request/taxation_manage.js
#	src/views/enterprise_management/basics_info_management/freight_trailer/index.vue
#	src/views/enterprise_management/basics_info_management/operation_vehicle/add.vue
#	src/views/enterprise_management/basics_info_management/operation_vehicle/edit.vue
#	src/views/mechanical_files/inspect_annually/index.vue
#	src/views/mechanical_files/insure/index.vue
#	src/views/mechanical_files/scrap_manage/add.vue
#	src/views/mechanical_files/taxation_manage/add.vue
#	src/views/mechanical_files/taxation_manage/edit.vue
2024-03-25 08:52:36 +08:00
xiepeng 70f430b6b6 修改车船税过户显示 营运车辆车牌号唯一 2024-03-25 08:47:41 +08:00
WenShiJun cd5110f5c5 年检管理,保险管理优化 2024-03-22 17:18:08 +08:00
WenShiJun 6c66a00624 Merge remote-tracking branch 'origin/dev' into dev 2024-03-22 14:36:07 +08:00
WenShiJun deaa659d2b 运单登记,地点管理,客户管理模块优化 2024-03-22 14:35:55 +08:00
LiuJiaNan 82f7c1709b dialog的:on-close换成@close 2024-03-21 11:49:21 +08:00
WenShiJun f4606dfdde 安全生产月活动,安全知识手册模块开发
运单登记,地点管理模块优化,
2024-03-20 16:58:12 +08:00
xiepeng abafba83fb Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	src/assets/js/constant.js
#	src/views/enterprise_management/basics_info_management/operation_vehicle/index.vue
#	src/views/mechanical_files/assigned_manage/add.vue
2024-03-19 14:08:38 +08:00
xiepeng 6419d6c50c 过户管理
报废管理
企业安全生产值班记录
生产设备设施台账
劳动防护用品发放记录
消防设备设施台账
上报事件处理台账
2024-03-19 14:04:17 +08:00
WenShiJun 375021971d Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	src/assets/js/constant.js
#	src/views/safety_production_related/things_check/index.vue
2024-03-15 17:55:34 +08:00
WenShiJun 9472c26770 生产安全事故档案模块开发 2024-03-15 17:54:28 +08:00
277151821@qq.com 5d9aba7426 删除console 2024-03-15 15:57:47 +08:00
277151821@qq.com a411f039ab 运营管理 2024-03-15 11:13:20 +08:00
277151821@qq.com 290a7a0d4c 维保管理 2024-03-15 11:12:49 +08:00