Commit Graph

518 Commits (261bcdf3d53b7e74891ea94631300e7e7fc18e70)

Author SHA1 Message Date
LiuJiaNan d669e371a0 14962 2024-04-03 09:26:05 +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
鲁洪霞 456855000a 2024-04-01 17:25:09 +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
wangpeng f2d72723ef 从危化版同步隐患排查所有功能 2024-04-01 09:21:56 +08:00
zhangyanli d7dd618c8a 档案管理和效果评估bug 2024-04-01 08:32:32 +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
WenShiJun 6e8d9f4154 点击编辑附件名称没有回显bug优化 2024-03-30 16:01:37 +08:00
zhangyanli b2813297c6 档案管理和效果评估bug 2024-03-30 14:57:28 +08:00
xiepeng f96eb0701c Merge remote-tracking branch 'origin/dev' into dev 2024-03-29 18:07:14 +08:00
xiepeng 328b76dcde BUG 优化 2024-03-29 18:07:08 +08:00
WenShiJun c60f698ef5 Merge remote-tracking branch 'origin/dev' into dev 2024-03-29 18:06:42 +08:00
WenShiJun adf753755b bug优化 2024-03-29 18:06:37 +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
zhangyanli 3cb8221676 教培功能bug修复 2024-03-27 15:53:32 +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 6c1000d5f9 页面样式优化,输入框内容清除 2024-03-25 14:27:52 +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 0e10930e28 Merge remote-tracking branch 'origin/dev' into dev 2024-03-25 10:17:49 +08:00
wangpeng 097433eaf4 Merge remote-tracking branch 'origin/dev' into dev 2024-03-25 09:41:59 +08:00
zhangyanli 5e1b790772 教培建班 2024-03-25 09:37:38 +08:00
wangpeng b098bf7dcd 部署异常修复 2024-03-25 09:27:54 +08:00
鲁洪霞 9684793f2d 2024-03-25 09:22:27 +08:00
LiuJiaNan 6df0f3f247 企业用户管理、档案管理、效果评估 2024-03-25 09:13:10 +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
chenxinying 2d1eb54c60 Merge remote-tracking branch 'origin/dev' into dev 2024-03-22 17:43:42 +08:00
chenxinying d7cccbed87 行车三检检查日志 2024-03-22 17:29:59 +08:00
WenShiJun 037e723d71 Merge remote-tracking branch 'origin/dev' into dev 2024-03-22 17:18:20 +08:00