diff --git a/src/views/firstLevelDoor/freightVehiclesPort/fleetFilingApplication/components/apply.vue b/src/views/firstLevelDoor/freightVehiclesPort/fleetFilingApplication/components/apply.vue
index 1623558..faf5c75 100644
--- a/src/views/firstLevelDoor/freightVehiclesPort/fleetFilingApplication/components/apply.vue
+++ b/src/views/firstLevelDoor/freightVehiclesPort/fleetFilingApplication/components/apply.vue
@@ -2,132 +2,28 @@
   
     
       
-        
-        
+        
+        
           
-            
-              
-                
![]()
+            
+              
+                
                
             
-            
+            
               
-                
-              
-            
-          
-        
-        
-        
-          
-            
-              
-                
![]()
-              
 
-            
-            
-              
-                
-              
-            
-          
-        
-        
-        
-          
-            
-              
-                
![]()
-              
 
-            
-            
-              
-                
-              
-            
-          
-        
-        
-        
-          
-            
-              
-                
![]()
-              
 
-            
-            
-              
-                
-              
-            
-          
-        
-        
-        
-          
-            
-              
-                
![]()
-              
 
-            
-            
-              
-                
+                
               
             
           
@@ -144,10 +40,12 @@
 
 
-
diff --git a/src/views/firstLevelDoor/freightVehiclesPort/fleetFilingApplication/components/list.vue b/src/views/firstLevelDoor/freightVehiclesPort/fleetFilingApplication/components/list.vue
index 8c08dbd..b349c1e 100644
--- a/src/views/firstLevelDoor/freightVehiclesPort/fleetFilingApplication/components/list.vue
+++ b/src/views/firstLevelDoor/freightVehiclesPort/fleetFilingApplication/components/list.vue
@@ -38,15 +38,43 @@
       
       
         
+          编辑
           备案申请
+          删除
         
       
     
     
     
+    
+    
+      
+        
+          
+        
+      
+      
+    
+    
+    
+      
+        
+          
+        
+      
+      
+    
    
 
 
@@ -64,12 +92,16 @@ export default{
       areaList: [], // 省市县列表
       placeList: [],
       listLoading: true,
+      addLoading: false,
+      editLoading: false,
       varList: [],
       total: 0,
       title: '',
       isShow: false,
       form: {
+        MOTORCADE_ID: '',
         MOTORCADE_NAME: '',
+        ADD_MOTORCADE_NAME: '',
         PHONE: '',
         ID_CARD: '',
         CORPINFO_NAME: '',
@@ -121,6 +153,64 @@ export default{
         this.listLoading = false
       })
     },
+    handleAdd(){
+      this.addLoading = true
+    },
+    saveMotorcade(){
+      requestFN(
+        '/mkmj/management/motorcadeInfoManagement',
+        {
+          MOTORCADE_NAME: this.form.ADD_MOTORCADE_NAME,
+          CORPINFO_ID: JSON.parse(sessionStorage.getItem('user')).CORPINFO_ID
+        }
+      ).then((data) => {
+        this.addLoading = false
+        this.form.MOTORCADE_NAME = ''
+        this.getQuery()
+      }).catch((e) => {
+        this.addLoading = false
+      })
+    },
+    handleEdit(row){
+      this.form.MOTORCADE_ID = row.MOTORCADE_ID
+      this.editLoading = true
+    },
+    editMotorcade(){
+      requestFN(
+        '/mkmj/management/motorcadeInfoManagement',
+        {
+          MOTORCADE_ID : this.form.MOTORCADE_ID,
+          MOTORCADE_NAME: this.form.ADD_MOTORCADE_NAME,
+          CORPINFO_ID: JSON.parse(sessionStorage.getItem('user')).CORPINFO_ID
+        }
+      ).then((data) => {
+        this.editLoading = false
+        this.form.MOTORCADE_NAME = ''
+        this.getQuery()
+      }).catch((e) => {
+        this.editLoading = false
+      })
+    },
+    handleDelete(row) {
+      this.$confirm('确定要删除吗?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        requestFN(
+          '/mkmj/management/deleteMotorCade',
+          {
+            MOTORCADE_ID : row.MOTORCADE_ID
+          }
+        ).then((data) => {
+            this.listLoading = false
+            this.getList()
+        }).catch((e) => {
+          this.listLoading = false
+        })
+      }).catch(() => {
+      })
+    },
     getAuditInfo(row) {
       this.$parent.activeName = 'Apply'
       this.$parent.MOTORCADE_ID = row.MOTORCADE_ID
diff --git a/src/views/firstLevelDoor/freightVehiclesPort/freightVehicleMaintenance/components/carList.vue b/src/views/firstLevelDoor/freightVehiclesPort/freightVehicleMaintenance/components/carList.vue
index 69479eb..7903d16 100644
--- a/src/views/firstLevelDoor/freightVehiclesPort/freightVehicleMaintenance/components/carList.vue
+++ b/src/views/firstLevelDoor/freightVehiclesPort/freightVehicleMaintenance/components/carList.vue
@@ -4,8 +4,8 @@
       
         
           
-            
-              
+            
+              
             
           
           
@@ -42,22 +42,21 @@
       
       
         
-          编辑
-          删除
+          编辑
+          删除
         
       
     
     
-    
     
       
-        
-          
+        
+          
         
         
         
@@ -81,20 +80,189 @@
             placeholder="请选择车辆类型"
             style="width: 300px"/>
         
-        
+        
+        
+          
+        
+        
           
         
-        
+        
           
         
+        
+          
+        
+        
+        
+          
+            点击上传
+          
+        
+
+        
+          
+            点击上传
+          
+        
+
+        
+          
+            点击上传
+          
+        
+
+        
+          
+            点击上传
+          
+        
+
+        
+          
+            点击上传
+          
+        
       
       
     
+    
+    
+      
+        
+          
+        
+        
+        
+          
+        
+        
+        
+          
+        
+        
+        
+          
+        
+        
+          
+        
+        
+          
+        
+        
+          
+        
+        
+        
+          
+            点击上传
+          
+        
 
-    
+        
+          
+            点击上传
+          
+        
+
+        
+          
+            点击上传
+          
+        
+
+        
+          
+            点击上传
+          
+        
+
+        
+          
+            点击上传
+          
+        
+      
+      
+    
+    
+      返回
+    
    
 
 
@@ -118,15 +286,25 @@ export default{
       title: '',
       isShow: false,
       addDialogVisible: false,
+      editDialogVisible: false,
       addForm: {
-        LICENCE_NO: '', // 车牌号
-        MOTORCADE_ID: '', // 所属车队ID
-        CORPINFO_ID: '',
+        VEHICLE_ID: '',
+        LICENCE_NO: '',
         LICENCE_TYPE: '',
         VEHICLE_TYPE: '',
         CONTACT: '',
         PHONE: '',
-        EMISSION_STANDARDS:'',
+        EMISSION_STANDARDS: '',
+        IS_DANGEROUS_CAR: '',
+        DRIVING_LICENSE: '',
+        GREEN_BOOK: '',
+        ECO_FRIENDLY_CHECKLIST: '',
+        FACTORY_CERTIFICATE: '',
+        ENVIRONMENTAL_SCREENSHOTS: '',
+        CORPINFO_ID: JSON.parse(sessionStorage.getItem('user')).CORPINFO_ID,
+        MOTORCADE_ID: this.$parent.MOTORCADE_ID,
+        VEHICLE_BELONG_TYPE: '3',
+        CAR_FROM: '2'
       },
       form: {
         MOTORCADE_NAME: '',
@@ -143,7 +321,6 @@ export default{
       },
       // 车牌类型列表
       licenceTypeList: [
-        // { ID: '', NAME: '请选择' },
         { ID: '0', NAME: '白牌' },
         { ID: '1', NAME: '蓝牌' },
         { ID: '2', NAME: '黄牌' },
@@ -157,6 +334,10 @@ export default{
         { ID: '1', NAME: '轿车' },
         { ID: '2', NAME: '大巴客车' }
       ],
+      DANGEROUS_CAR_LIST: [
+        { ID: '0', NAME: '否' },
+        { ID: '1', NAME: '是' },
+      ],
       // 车辆下拉树默认属性
       vehicleDefaultProps: {
         value: 'ID',
@@ -211,7 +392,7 @@ export default{
         if (result) {
           console.log('格式校验通过')
           requestFN(
-            'vehiclemessage/goCheckLicenceNo',
+            '/mkmj/management/goCheckLicenceNo',
             {
               'LICENCE_NO': this.addForm.LICENCE_NO
             }
@@ -241,26 +422,108 @@ export default{
       this.ISCHECK = false
     },
     reSetAddDialog() {
-      this.addForm.LICENCE_NO = ''
-      this.addForm.USER_ID = ''
-      this.addForm.VEHICLE_DEPARTMENT_ID = ''
-      this.addForm.LICENCE_TYPE = ''
-      this.addForm.VEHICLE_TYPE = ''
-      this.addForm.VEHICLE_BELONG_TYPE = ''
-      this.addForm.EMPLOYEE_VEHICLE_USER_ID = ''
-      this.userList = []
-      this.addForm.DEPARTMENT_NAME = ''
-      this.addForm.DEPARTMENT_ID = ''
+        this.addForm.VEHICLE_ID = '',
+        this.addForm.LICENCE_NO = '',
+        this.addForm.LICENCE_TYPE = '',
+        this.addForm.VEHICLE_TYPE = '',
+        this.addForm.CONTACT = '',
+        this.addForm.PHONE = '',
+        this.addForm.EMISSION_STANDARDS = '',
+        this.addForm.IS_DANGEROUS_CAR = '',
+        this.addForm.DRIVING_LICENSE = '',
+        this.addForm.GREEN_BOOK = '',
+        this.addForm.ECO_FRIENDLY_CHECKLIST = '',
+        this.addForm.FACTORY_CERTIFICATE = '',
+        this.addForm.ENVIRONMENTAL_SCREENSHOTS = ''
+    },
+    handleDrivingLicenseSuccess(response, file) {
+      this.addForm.DRIVING_LICENSE = response.uploadPath;
+    },
+    handleGreenBookSuccess(response, file) {
+      this.addForm.GREEN_BOOK = response.uploadPath;
+    },
+    handleEcoFriendlyChecklistSuccess(response, file) {
+      this.addForm.ECO_FRIENDLY_CHECKLIST = response.uploadPath;
+    },
+    handleFactoryCertificateSuccess(response, file) {
+      this.addForm.FACTORY_CERTIFICATE = response.uploadPath;
+    },
+    handleEnvironmentalScreenshotsSuccess(response, file) {
+      this.addForm.ENVIRONMENTAL_SCREENSHOTS = response.uploadPath;
+    },
+    beforeUpload(file) {
+      // 文件上传前的校验逻辑
+      const isLt2M = file.size / 1024 / 1024 < 2;
+      if (!isLt2M) {
+        this.$message.error('上传文件大小不能超过 2MB!');
+      }
+      return isLt2M;
     },
-    // 添加弹窗的取消按钮
     addDialogCancelBtn() {
-      this.addDialogVisible = false
+      this.addDialogVisible = false;
     },
-    getAuditInfo(row) {
-      this.$refs.flowStep.init(row)
+    addDialogConfirmBtn() {
+      requestFN(
+        '/mkmj/management/carInfoMaintenance' ,
+        this.addForm
+      ).then((data) => {
+        this.addDialogVisible = false
+        this.reSetAddDialog()
+        this.getList()
+      }).catch((e) => {
+        this.addDialogVisible = false
+      })
+    },
+    goDelete(row){
+      this.$confirm('确定要删除吗?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        requestFN(
+          '/mkmj/management/deleteCarInfo',
+          {
+            VEHICLE_ID : row.VEHICLE_ID
+          }
+        ).then((data) => {
+          this.listLoading = false
+          this.getList()
+        }).catch((e) => {
+          this.listLoading = false
+        })
+      }).catch(() => {
+      })
+    },
+    goEdit(row){
+      this.addForm.VEHICLE_ID = row.VEHICLE_ID
+      this.editDialogVisible = true
+    },
+    editDialogCancelBtn(){
+      this.editDialogVisible = false
+    },
+    editDialogConfirmBtn(){
+      requestFN(
+        '/mkmj/management/carInfoMaintenance' ,
+        this.addForm
+      ).then((data) => {
+        this.editDialogVisible = false
+        this.reSetAddDialog()
+        this.getList()
+      }).catch((e) => {
+        this.editDialogVisible = false
+      })
+    },
+    goBack(){
+      this.$parent.activeName = 'List'
     }
   }
 
 }
 
 
+
diff --git a/src/views/firstLevelDoor/freightVehiclesPort/freightVehicleMaintenance/components/list.vue b/src/views/firstLevelDoor/freightVehiclesPort/freightVehicleMaintenance/components/list.vue
index fef91bf..e579381 100644
--- a/src/views/firstLevelDoor/freightVehiclesPort/freightVehicleMaintenance/components/list.vue
+++ b/src/views/firstLevelDoor/freightVehiclesPort/freightVehicleMaintenance/components/list.vue
@@ -123,6 +123,7 @@ export default{
     },
     carMaintenance(row) {
       console.log('---------------------------------')
+      console.log(row)
       this.$parent.MOTORCADE_ID = row.MOTORCADE_ID
       this.$parent.activeName = 'CarList'
     },
diff --git a/src/views/firstLevelDoor/freightVehiclesPort/freightVehiclesRecords/components/list.vue b/src/views/firstLevelDoor/freightVehiclesPort/freightVehiclesRecords/components/list.vue
new file mode 100644
index 0000000..7ff584a
--- /dev/null
+++ b/src/views/firstLevelDoor/freightVehiclesPort/freightVehiclesRecords/components/list.vue
@@ -0,0 +1,128 @@
+
+  
+    
+      
+        
+          
+            
+              
+            
+          
+          
+            搜索
+            重置
+          
+        
+      
+    
+    
+      
+      
+      
+      
+      
+      
+      
+      
+      
+    
+    
+  
 
+
+
+
+
diff --git a/src/views/firstLevelDoor/freightVehiclesPort/freightVehiclesRecords/index.vue b/src/views/firstLevelDoor/freightVehiclesPort/freightVehiclesRecords/index.vue
new file mode 100644
index 0000000..6a88239
--- /dev/null
+++ b/src/views/firstLevelDoor/freightVehiclesPort/freightVehiclesRecords/index.vue
@@ -0,0 +1,24 @@
+
+  
+    
+  
+
+
+
+
+
diff --git a/src/views/firstLevelDoor/freightVehiclesPort/oprtApplication/components/carList.vue b/src/views/firstLevelDoor/freightVehiclesPort/oprtApplication/components/carList.vue
new file mode 100644
index 0000000..62758ca
--- /dev/null
+++ b/src/views/firstLevelDoor/freightVehiclesPort/oprtApplication/components/carList.vue
@@ -0,0 +1,322 @@
+
+  
+    
+      
+        
+          
+            
+              
+            
+          
+          
+            搜索
+            重置
+          
+        
+      
+    
+    
+      
+      
+      
+      
+      
+      
+      
+      
+        
+                待公安审批
+                待企业审批
+                企业审批通过
+        
+      
+      
+        
+          申请
+        
+      
+    
+    
+    
+      
+        
+          
+          
+        
+        
+          
+          
+        
+        
+          
+            
+            
+          
+        
+        
+          
+            
+            
+          
+        
+        
+          
+            
+            
+          
+        
+      
+      
+    
+  
 
+
+
+
+
diff --git a/src/views/firstLevelDoor/freightVehiclesPort/oprtApplication/components/list.vue b/src/views/firstLevelDoor/freightVehiclesPort/oprtApplication/components/list.vue
new file mode 100644
index 0000000..5f87a78
--- /dev/null
+++ b/src/views/firstLevelDoor/freightVehiclesPort/oprtApplication/components/list.vue
@@ -0,0 +1,136 @@
+
+  
+    
+      
+        
+          
+            
+              
+            
+          
+          
+            搜索
+            重置
+          
+        
+      
+    
+    
+      
+      
+      
+      
+        
+          入港申请
+        
+      
+    
+    
+    
+  
 
+
+
+
+
diff --git a/src/views/firstLevelDoor/freightVehiclesPort/oprtApplication/index.vue b/src/views/firstLevelDoor/freightVehiclesPort/oprtApplication/index.vue
new file mode 100644
index 0000000..fdc26d8
--- /dev/null
+++ b/src/views/firstLevelDoor/freightVehiclesPort/oprtApplication/index.vue
@@ -0,0 +1,27 @@
+
+  
+    
+    
+  
+
+
+
+
+
diff --git a/src/views/firstLevelDoor/longCarPort/CarInfo/components/list.vue b/src/views/firstLevelDoor/longCarPort/CarInfo/components/list.vue
index b5b3d4e..596870e 100644
--- a/src/views/firstLevelDoor/longCarPort/CarInfo/components/list.vue
+++ b/src/views/firstLevelDoor/longCarPort/CarInfo/components/list.vue
@@ -77,25 +77,24 @@
           {{ translateVehicleType(row.VEHICLE_TYPE) }}
         
       
-      
-      
-
-
-
-
-
-
+      
+      
+      
+        
+          车辆进出记录
+        
+      
     
     
-    
     
       
-        
-          
+        
+          
         
         
         
@@ -119,40 +118,30 @@
             placeholder="请选择车辆类型"
             style="width: 300px"/>
         
-        
-        
-          
-        
-        
-        
-          
-        
-        
-          
-        
-        
-        
-          
-            
+        
+          
+            
+            
           
         
-        
-          
+        
+          
+            
+            
+          
         
       
       
     
-    
-      
-        
-          
-        
-        
-          
-            
-          
-        
-        
-          
-            
-          
-        
-        
-          
-            
-          
-        
-        
-        
-          
-        
-        
-          
-        
-        
-        
-          
-            
-          
-        
-        
-          
-        
-      
-      
-    
-    
-      
-        
-          
-        
-        
-          
-        
-        
-          
-        
-        
-          
-        
-        
-          
-        
-        
-          
-        
-      
-      
-    
    
 
 
diff --git a/src/views/firstLevelDoor/longCarPort/CarInfo/index.vue b/src/views/firstLevelDoor/longCarPort/CarInfo/index.vue
index 920f9b4..26f4623 100644
--- a/src/views/firstLevelDoor/longCarPort/CarInfo/index.vue
+++ b/src/views/firstLevelDoor/longCarPort/CarInfo/index.vue
@@ -1,14 +1,17 @@