diff --git a/src/api/basicdata/basicdataVehicle.js b/src/api/basicdata/basicdataVehicle.js
index 0e5698c7..01412a84 100644
--- a/src/api/basicdata/basicdataVehicle.js
+++ b/src/api/basicdata/basicdataVehicle.js
@@ -2,7 +2,7 @@ import request from '@/axios';
 
 export const getList = (current, size, params) => {
   return request({
-    url: '/api/logpm-basicdata/vehicle/list',
+    url: '/api/logpm-basicdata/vehicle/page',
     method: 'get',
     params: {
       ...params,
diff --git a/src/option/basicdata/basicdataVehicle.js b/src/option/basicdata/basicdataVehicle.js
index c3fe0cab..9a1149c6 100644
--- a/src/option/basicdata/basicdataVehicle.js
+++ b/src/option/basicdata/basicdataVehicle.js
@@ -7,6 +7,7 @@ export default {
   border: true,
   index: true,
   viewBtn: false,
+  editBtn: false,
   selection: true,
   dialogClickModal: false,
   column: [
@@ -502,19 +503,19 @@ export default {
       align:'center',
       span:11,
     },
-    {
-      label: "车辆挂靠公司",
-      prop: "vehicleParkingCompany",
-      type: "input",
-      labelWidth:'150',
-      width:"150px",
-      align:'center',
-      span:11,
-    },
+    // {
+    //   label: "车辆挂靠公司",
+    //   prop: "vehicleParkingCompany",
+    //   type: "input",
+    //   labelWidth:'150',
+    //   width:"150px",
+    //   align:'center',
+    //   span:11,
+    // },
     {
       label: "是否有GPS",
       prop: "withGps",
-      type: "input",
+      type: "select",
       labelWidth:'150',
       width:"150px",
       align:'center',
@@ -687,26 +688,28 @@ export default {
         url: 'link',
       },
     },
-    // {
-    //   label: "历史照片",
-    //   prop: "historicPhotos",
-    //   type: 'upload',
-    //   listType: 'picture-card',
-    //   dataType: 'string',
-    //   labelWidth:'150',
-    //   span:11,
-    //   addDisplay: true,
-    //   multiple:true,
-    //   width:"200px",
-    //   align:'left',
-    //   action: '/blade-resource/oss/endpoint/put-file',
-    //   limit: 3,
-    //   disabled:true,
-    //   propsHttp: {
-    //     res: 'data',
-    //     url: 'link',
-    //   },
-    // },
+    {
+      label: "车俩历史照片",
+      prop: "historicPhotos",
+      type: 'upload',
+      listType: 'picture-card',
+      dataType: 'string',
+      labelWidth:'150',
+      span:11,
+      multiple:true,
+      width:"200px",
+      align:'left',
+      action: '/blade-resource/oss/endpoint/put-file',
+      limit: 3,
+      disabled:true,
+      addDisplay: false,
+      editDisplay: false,
+      viewDisplay: false,
+      propsHttp: {
+        res: 'data',
+        url: 'link',
+      },
+    },
 
     {
       label: "预留1",
diff --git a/src/views/basicdata/vehicle/basicdataVehicleform.vue b/src/views/basicdata/vehicle/basicdataVehicleform.vue
index d6ccdbd5..96c10165 100644
--- a/src/views/basicdata/vehicle/basicdataVehicleform.vue
+++ b/src/views/basicdata/vehicle/basicdataVehicleform.vue
@@ -24,9 +24,7 @@
 </template>
 
 <script>
-import {  getDetail as getDetailDelineNode, } from '@/api/basic/basicDelineNode';
-import {getList} from '@/api/basic/basicDelineNode';
-import {add,update} from '@/api/basic/basicdeline';
+import {update} from '@/api/basicdata/basicdataVehicle';
 
 import { getDetail as getDetailWarehouse } from '@/api/basicdata/basicdataWarehouse';
 export default {
@@ -44,13 +42,7 @@ export default {
       //防止重复点击
       isDis:false,
       nodequery:{},
-      // option: {
-      //   emptyBtn: false, //隐藏清空按钮
-      //   submitBtn: false, //隐藏提交按钮
-      //   tableData: [],
-      // },
       form: {
-
       },
       // 分页信息
       nodepage: {
@@ -67,6 +59,7 @@ export default {
         searchShow: true,
         searchMenuSpan: 6,
         border: true,
+        disabled:this.vehicleformdata.view,
         index: true,
         viewBtn: false,
         selection: true,
@@ -564,19 +557,19 @@ export default {
             align:'center',
             span:6,
           },
-          {
-            label: "车辆挂靠公司",
-            prop: "vehicleParkingCompany",
-            type: "input",
-            labelWidth:'150',
-            width:"150px",
-            align:'center',
-            span:6,
-          },
+          // {
+          //   label: "车辆挂靠公司",
+          //   prop: "vehicleParkingCompany",
+          //   type: "input",
+          //   labelWidth:'150',
+          //   width:"150px",
+          //   align:'center',
+          //   span:6,
+          // },
           {
             label: "是否有GPS",
             prop: "withGps",
-            type: "input",
+            type: "select",
             labelWidth:'150',
             width:"150px",
             align:'center',
@@ -749,25 +742,25 @@ export default {
               url: 'link',
             },
           },
-          // {
-          //   label: "历史照片",
-          //   prop: "historicPhotos",
-          //   type: 'upload',
-          //   listType: 'picture-card',
-          //   dataType: 'string',
-          //   labelWidth:'150',
-          //   span:6,
-          //   multiple:true,
-          //   width:"200px",
-          //   align:'left',
-          //   action: '/blade-resource/oss/endpoint/put-file',
-          //   limit: 3,
-          //   disabled:true,
-          //   propsHttp: {
-          //     res: 'data',
-          //     url: 'link',
-          //   },
-          // },
+          {
+            label: "历史照片",
+            prop: "historicPhotos",
+            type: 'upload',
+            listType: 'picture-card',
+            dataType: 'string',
+            labelWidth:'150',
+            span:12,
+            multiple:true,
+            width:"200px",
+            align:'left',
+            action: '/blade-resource/oss/endpoint/put-file',
+            limit: 3,
+            disabled:true,
+            propsHttp: {
+              res: 'data',
+              url: 'link',
+            },
+          },
 
           // {
           //   label: "预留1",
@@ -841,25 +834,10 @@ export default {
     submitForm(){
       this.$refs.myForm.validate(valid => {
         if (valid) {
-          //处理DTO
-          this.form.ageing=this.form.end[0].ageing
-          this.form.route=this.form.end[0].route
-          this.form.warehouseAddress=this.form.end[0].warehouseAddress
-          this.form.warehouseContacts=this.form.end[0].warehouseContacts
-          this.form.warehouseId=this.form.end[0].warehouseId
-          this.form.warehouseName=this.form.end[0].warehouseName
-          this.form.warehousePhone=this.form.end[0].warehousePhone
-          this.form.nodeNub = this.form.delinenode.length + 1
-          let a = ''
-          for (let i = 0; i < this.form.delinenode.length; i++) {
-            a += (this.form.delinenode[i].customer +"->")
-          }
-          a += this.form.end[0].warehouseName
-          this.form.lineName = a
-          console.log("处理>>>>>>>>>>>>",this.form);
           this.isDis = true;
           let row = this.form
-          if (!!row.id){
+          console.log("更新参数>>>>>>>>",row);
+        //  if (!!row.id){
             update(row).then(() => {
               this.$message({
                 type: "success",
@@ -869,27 +847,27 @@ export default {
                 val: true
               }
               this.isDis = false;
-              this.$emit("returnDeline", str);
+              this.$emit("returnvehicle", str);
             }, error => {
               this.isDis = false;
               console.log(error);
             });
-          }else {
-            add(row).then(() => {
-              this.$message({
-                type: "success",
-                message: "操作成功!"
-              });
-              let str = {
-                val: true
-              }
-              this.isDis = false;
-              this.$emit("returnDeline", str);
-            }, error => {
-              this.isDis = false;
-              window.console.log(error);
-            });
-          }
+          // }else {
+          //   add(row).then(() => {
+          //     this.$message({
+          //       type: "success",
+          //       message: "操作成功!"
+          //     });
+          //     let str = {
+          //       val: true
+          //     }
+          //     this.isDis = false;
+          //     this.$emit("returnDeline", str);
+          //   }, error => {
+          //     this.isDis = false;
+          //     window.console.log(error);
+          //   });
+          // }
         }
       });
     }