Merge remote-tracking branch 'origin/dev' into dev

src/api/basicdata/basicdataDriverArtery.js

@@ -12,6 +12,24 @@ export const getList = (current, size, params) => {
   })
 }
 
+export const getPage = (current, size, params) => {
+  return request({
+    url: '/api/logpm-basicdata/driverArtery/page',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
+    }
+  })
+}
+export const getOwn = () => {
+  return request({
+    url: '/api/logpm-basicdata/driverArtery/dictionary',
+    method: 'get',
+  })
+}
+
 export const getDetail = (id) => {
   return request({
     url: '/api/logpm-basicdata/driverArtery/detail',
@@ -34,15 +52,16 @@ export const remove = (ids) => {
 
 export const add = (row) => {
   return request({
-    url: '/api/logpm-basicdata/driverArtery/submit',
+    url: '/api/logpm-basicdata/driverArtery/save',
     method: 'post',
     data: row
   })
 }
 
+
 export const update = (row) => {
   return request({
-    url: '/api/logpm-basicdata/driverArtery/submit',
+    url: '/api/logpm-basicdata/driverArtery/update',
     method: 'post',
     data: row
   })

src/api/basicdata/basicdataVehicle.js

@@ -1,6 +1,17 @@
 import request from '@/axios';
 
 export const getList = (current, size, params) => {
+  return request({
+    url: '/api/logpm-basicdata/vehicle/list',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
+    }
+  })
+}
+export const getPage = (current, size, params) => {
   return request({
     url: '/api/logpm-basicdata/vehicle/page',
     method: 'get',
@@ -11,6 +22,12 @@ export const getList = (current, size, params) => {
     }
   })
 }
+export const getVehicle = () => {
+  return request({
+    url: '/api/logpm-basicdata/vehicle/dictionary',
+    method: 'get',
+  })
+}
 
 export const getDetail = (id) => {
   return request({
@@ -34,7 +51,7 @@ export const remove = (ids) => {
 
 export const add = (row) => {
   return request({
-    url: '/api/logpm-basicdata/vehicle/submit',
+    url: '/api/logpm-basicdata/vehicle/save',
     method: 'post',
     data: row
   })
@@ -58,5 +75,8 @@ export const getVehicleList = (current, size, params) => {
       size,
     }
   })
+
+
+
 }
 

src/option/basicdata/basicdataDriverArtery.js

@@ -167,11 +167,21 @@ export default {
     {
       label: "绑定车辆",
       prop: "bindVehicle",
-      type: "input",
-      addDisplay: false,
-      editDisplay: false,
-      viewDisplay: false,
-      hide: true,
+      type: "select",
+      labelWidth:'150',
+      width:"100px",
+      align:'center',
+      span:11,
+      dicUrl: '/api/logpm-basicdata/vehicle/dictionary',
+      props: {
+        label: 'vehicleNub',
+        value: 'id',
+        disabled: true
+      },
+      // addDisplay: false,
+      // editDisplay: false,
+      // viewDisplay: false,
+      // hide: true,
     },
     {
       label: "合同开始时间",

src/views/basicdata/driverArtery/basicdataDriverArtery.vue

@@ -37,7 +37,8 @@
 </template>
 
 <script>
-  import {getList, getDetail, add, update, remove} from "@/api/basicdata/basicdataDriverArtery";
+  import {getList, getDetail, add, update, remove,getPage} from "@/api/basicdata/basicdataDriverArtery";
+  import {getVehicle } from "@/api/basicdata/basicdataVehicle";
   import option from "@/option/basicdata/basicdataDriverArtery";
   import {mapGetters} from "vuex";
   import {exportBlob} from "@/api/common";
@@ -46,11 +47,11 @@
   import {dateNow} from "@/utils/date";
   import NProgress from 'nprogress';
   import 'nprogress/nprogress.css';
-
   export default {
     data() {
       return {
-        form: {},
+        form: {
+        },
         query: {},
         search: {},
         loading: true,
@@ -60,7 +61,493 @@
           total: 0
         },
         selectionList: [],
-        option: option,
+        option: {
+          height:'auto',
+          calcHeight: 30,
+          tip: false,
+          searchShow: true,
+          searchMenuSpan: 6,
+          border: true,
+          index: true,
+          viewBtn: true,
+          selection: true,
+          dialogClickModal: false,
+          column: [
+            {
+              label: "主键",
+              prop: "id",
+              type: "input",
+              addDisplay: false,
+              editDisplay: false,
+              viewDisplay: false,
+              hide: true,
+            },
+            {
+              label: "租户号",
+              prop: "tenantId",
+              type: "input",
+              addDisplay: false,
+              editDisplay: false,
+              viewDisplay: false,
+              hide: true,
+            },
+            {
+              label: "创建人",
+              prop: "createUser",
+              type: "input",
+              addDisplay: false,
+              editDisplay: false,
+              viewDisplay: false,
+              hide: true,
+            },
+            {
+              label: "创建时间",
+              prop: "createTime",
+              type: "input",
+              addDisplay: false,
+              editDisplay: false,
+              viewDisplay: false,
+              hide: true,
+            },
+            {
+              label: "更新人",
+              prop: "updateUser",
+              type: "input",
+              addDisplay: false,
+              editDisplay: false,
+              viewDisplay: false,
+              hide: true,
+            },
+            {
+              label: "更新时间",
+              prop: "updateTime",
+              type: "input",
+              addDisplay: false,
+              editDisplay: false,
+              viewDisplay: false,
+              hide: true,
+            },
+            {
+              label: "状态",
+              prop: "status",
+              type: "input",
+              addDisplay: false,
+              editDisplay: false,
+              viewDisplay: false,
+              hide: true,
+            },
+            {
+              label: "是否已删除;1-未删除，2-已删除",
+              prop: "isDeleted",
+              type: "input",
+              addDisplay: false,
+              editDisplay: false,
+              viewDisplay: false,
+              hide: true,
+            },
+            {
+              label: "创建部门",
+              prop: "createDept",
+              type: "input",
+              addDisplay: false,
+              editDisplay: false,
+              viewDisplay: false,
+              hide: true,
+            },
+            {
+              label: "姓名",
+              prop: "name",
+              type: "input",
+              search: true,
+              labelWidth:'150',
+              width:"100px",
+              align:'center',
+              span:11,
+            },
+            {
+              label: "手机号码",
+              prop: "phone",
+              type: "input",
+              search: true,
+              labelWidth:'150',
+              width:"100px",
+              align:'center',
+              span:11,
+            },
+            {
+              label: "司机类型",
+              prop: "type",
+              type: "select",
+              search: true,
+              labelWidth:'150',
+              dicUrl: '/api/blade-system/dict-biz/dictionary?code=basic_driver_type',
+              props: {
+                label: 'dictValue',
+                value: 'dictKey',
+              },
+              width:"100px",
+              align:'center',
+              span:11,
+            },
+            {
+              label: "职务类型",
+              prop: "jobType",
+              type: "select",
+              search: true,
+              labelWidth:'150',
+              dicUrl: '/api/blade-system/dict-biz/dictionary?code=basic_driverjob_type',
+              props: {
+                label: 'dictValue',
+                value: 'dictKey',
+              },
+              width:"100px",
+              align:'center',
+              span:11,
+            },
+            {
+              label: "准驾车型",
+              prop: "drivingType",
+              type: "select",
+              labelWidth:'150',
+              dicUrl: '/api/blade-system/dict-biz/dictionary?code=basic_driving_type',
+              props: {
+                label: 'dictValue',
+                value: 'dictKey',
+              },
+              width:"100px",
+              align:'center',
+              span:11,
+            },
+            {
+              label: "备注",
+              prop: "notes",
+              type: "input",
+              labelWidth:'150',
+              width:"100px",
+              align:'center',
+              span:11,
+            },
+            {
+              label: "绑定车辆",
+              prop: "bindVehicles",
+              type: "select",
+              labelWidth:'150',
+              width:"200px",
+              align:'center',
+              span:11,
+              multiple: true,
+              dicData: [],
+              // dicUrl: '/api/logpm-basicdata/vehicle/dictionary',
+              // props: {
+              //   label: 'vehicleNub',
+              //   value: 'id',
+              // },
+              // addDisplay: false,
+              // editDisplay: false,
+              // viewDisplay: false,
+              // hide: true,
+            },
+            {
+              label: "合同开始时间",
+              prop: "contractStartTime",
+              type: "date",
+              format: "YYYY-MM-DD",
+              valueFormat: "YYYY-MM-DD",
+              labelWidth:'150',
+              width:"150px",
+              align:'center',
+              span:11,
+            },
+            {
+              label: "合同结束时间",
+              prop: "contractEndTime",
+              type: "date",
+              format: "YYYY-MM-DD",
+              valueFormat: "YYYY-MM-DD",
+              labelWidth:'150',
+              width:"150px",
+              align:'center',
+              span:11,
+            },
+            {
+              label: "身份证号",
+              prop: "idCard",
+              type: "input",
+              labelWidth:'150',
+              width:"100px",
+              align:'center',
+              span:11,
+            },
+            {
+              label: "性别",
+              prop: "gender",
+              type: "select",
+              labelWidth:'150',
+              width:"100px",
+              align:'center',
+              span:11,
+              dicUrl: '/api/blade-system/dict-biz/dictionary?code=sex',
+              props: {
+                label: 'dictValue',
+                value: 'dictKey',
+              },
+            },
+            {
+              label: "居住地址",
+              prop: "residentialAddress",
+              type: "input",
+              labelWidth:'150',
+              width:"100px",
+              align:'center',
+              span:11,
+            },
+            {
+              label: "银行类型",
+              prop: "bankType",
+              type: "select",
+              labelWidth:'150',
+              width:"100px",
+              align:'center',
+              span:11,
+              dicUrl: '/api/blade-system/dict-biz/dictionary?code=basic_bank_type',
+              props: {
+                label: 'dictValue',
+                value: 'dictKey',
+              },
+            },
+            {
+              label: "银行卡号",
+              prop: "bankCardNub",
+              type: "input",
+              labelWidth:'150',
+              width:"100px",
+              align:'center',
+              span:11,
+            },
+            {
+              label: "驾驶证号",
+              prop: "driverLicenseNub",
+              type: "input",
+              labelWidth:'150',
+              width:"100px",
+              align:'center',
+              span:11,
+            },
+            {
+              label: "驾驶证发证机关",
+              prop: "driverLicenseOrgan",
+              type: "input",
+              labelWidth:'150',
+              width:"150px",
+              align:'center',
+              span:11,
+            },
+            {
+              label: "驾驶证起始日期",
+              prop: "driverLicenseStartTime",
+              type: "date",
+              format: "YYYY-MM-DD",
+              valueFormat: "YYYY-MM-DD",
+              labelWidth:'150',
+              width:"150px",
+              align:'center',
+              span:11,
+            },
+            {
+              label: "驾驶证到期日期",
+              prop: "driverLicenseEndTime",
+              type: "date",
+              format: "YYYY-MM-DD",
+              valueFormat: "YYYY-MM-DD",
+              labelWidth:'150',
+              width:"150px",
+              align:'center',
+              span:11,
+            },
+            {
+              label: "从业资格证编号",
+              prop: "employeeQualificationNub",
+              type: "input",
+              labelWidth:'150',
+              width:"150px",
+              align:'center',
+              span:11,
+            },
+            {
+              label: "道路经营许可证号",
+              prop: "roadOperationLicenseNub",
+              type: "input",
+              labelWidth:'150',
+              width:"150px",
+              align:'center',
+              span:11,
+            },
+            {
+              label: "承运商",
+              prop: "carrierId",
+              type: "select",
+              labelWidth:'150',
+              width:"100px",
+              align:'center',
+              search: true,
+              span:11,
+              filterable: true,
+              dicUrl: '/api/logpm-basicdata/carrier/dictionary',
+              props: {
+                label: 'number',
+                value: 'id',
+              },
+              rules: [{ required: true, message: '请选择承运商!',trigger: 'blur'}],
+            },
+            {
+              label: "运输协议",
+              prop: "transportationAgreement",
+              type: "input",
+              labelWidth:'150',
+              width:"100px",
+              align:'center',
+              span:11,
+            },
+            {
+              label: "人证合照照片",
+              prop: "licensePeoplePhoto",
+              type: "upload",
+              dataType: 'string',
+              listType: 'picture-img',
+              hide: true,
+              labelWidth:'150',
+              span:11,
+              multiple:false,
+              width:"200px",
+              align:'left',
+              action: '/blade-resource/oss/endpoint/put-file',
+              propsHttp: {
+                res: 'data',
+                url: 'link',
+              },
+            },
+            {
+              label: "身份证正面照片",
+              prop: "idCardFrontPhoto",
+              type: "upload",
+              dataType: 'string',
+              listType: 'picture-img',
+              hide: true,
+              labelWidth:'150',
+              span:11,
+              multiple:false,
+              width:"200px",
+              align:'left',
+              action: '/blade-resource/oss/endpoint/put-file',
+              propsHttp: {
+                res: 'data',
+                url: 'link',
+              },
+            },
+            {
+              label: "身份证背面照片",
+              prop: "idCardBackPhoto",
+              type: "upload",
+              dataType: 'string',
+              listType: 'picture-img',
+              hide: true,
+              labelWidth:'150',
+              span:11,
+              multiple:false,
+              width:"200px",
+              align:'left',
+              action: '/blade-resource/oss/endpoint/put-file',
+              propsHttp: {
+                res: 'data',
+                url: 'link',
+              },
+            },
+            {
+              label: "驾驶证照片",
+              prop: "driverLicensePhoto",
+              type: "upload",
+              dataType: 'string',
+              listType: 'picture-img',
+              hide: true,
+              labelWidth:'150',
+              span:11,
+              multiple:false,
+              width:"200px",
+              align:'left',
+              action: '/blade-resource/oss/endpoint/put-file',
+              propsHttp: {
+                res: 'data',
+                url: 'link',
+              },
+            },
+            {
+              label: "驾驶证背面照片",
+              prop: "driverLicensePhotoBack",
+              type: "upload",
+              dataType: 'string',
+              listType: 'picture-img',
+              hide: true,
+              labelWidth:'150',
+              span:11,
+              multiple:false,
+              width:"200px",
+              align:'left',
+              action: '/blade-resource/oss/endpoint/put-file',
+              propsHttp: {
+                res: 'data',
+                url: 'link',
+              },
+            },
+
+
+            {
+              label: "预留1",
+              prop: "reserve1",
+              type: "input",
+              addDisplay: false,
+              editDisplay: false,
+              viewDisplay: false,
+              hide: true,
+            },
+            {
+              label: "预留2",
+              prop: "reserve2",
+              type: "input",
+              addDisplay: false,
+              editDisplay: false,
+              viewDisplay: false,
+              hide: true,
+            },
+            {
+              label: "预留3",
+              prop: "reserve3",
+              type: "input",
+              addDisplay: false,
+              editDisplay: false,
+              viewDisplay: false,
+              hide: true,
+            },
+            {
+              label: "预留4",
+              prop: "reserve4",
+              type: "input",
+              addDisplay: false,
+              editDisplay: false,
+              viewDisplay: false,
+              hide: true,
+            },
+            {
+              label: "预留5",
+              prop: "reserve5",
+              type: "input",
+              addDisplay: false,
+              editDisplay: false,
+              viewDisplay: false,
+              hide: true,
+            },
+          ]
+        }
+        ,
         data: []
       };
     },
@@ -220,19 +707,53 @@
         } = this.query;
 
         let values = {
-            name_like: name,
-            phone_like: phone,
-            type_equal: type,
-            jobType_equal: jobType,
-          carrierId_equal: carrierId,
+            name: name,
+            phone: phone,
+            type: type,
+            jobType: jobType,
+          carrierId: carrierId,
         };
 
-        getList(page.currentPage, page.pageSize, values).then(res => {
+        getPage(page.currentPage, page.pageSize, values).then(res => {
           const data = res.data.data;
           this.page.total = data.total;
           this.data = data.records;
           this.loading = false;
-          this.selectionClear();
+          // console.log("this.option.column>>>>>>>",this.option.column);
+           this.option.column[15].dicData =[]
+          //查询车辆绑定情况
+          this.getVehiclede();
+          // getVehicle().then(res => {
+          //   console.log("res.data.data>>>>>>>",res.data.data)
+          //    res.data.data.map(v=>{
+          //      let value =
+          //        {
+          //        label: v.vehicleNub,
+          //        value: v.id,
+          //        disabled: true
+          //      }
+          //      if (v.vehicleOwner ==1){
+          //        value.disabled =false
+          //      }
+          //      this.option.column[15].dicData.push(value)
+          //
+          //    })
+          // });
+       //   this.selectionClear();
+        });
+      },
+      //查询车辆绑定情况
+      getVehiclede(){
+        getVehicle().then(res => {
+          console.log("res.data.data>>>>>>>",res.data.data)
+          res.data.data.map(v=>{
+            let value =
+              {
+                label: v.vehicleNub,
+                value: v.id,
+              }
+            this.option.column[15].dicData.push(value)
+          })
         });
       }
     }

src/views/basicdata/vehicle/basicdataVehicle.vue

@@ -38,12 +38,13 @@
         <el-button type="primary" text icon="el-icon-view" @click="viewDeline(row)">查 看</el-button>
       </template>
     </avue-crud>
-    <basicdata-vehicleform @returnvehicle="returnvehicle" :vehicleformdata="vehicleformdata" v-if="!edit" />
+    <basicdata-vehicleform @returnvehicle="returnvehicle" :vehicleformdata="vehicleformdata" :dicDatas="dicDatas" v-if="!edit" />
   </basic-container>
 </template>
 
 <script>
-import { getList, getDetail, add, update, remove } from '@/api/basicdata/basicdataVehicle';
+import { getList, getDetail, add, update, remove, getPage, getVehicle } from '@/api/basicdata/basicdataVehicle';
+import { getOwn} from '@/api/basicdata/basicdataDriverArtery';
 import option from '@/option/basicdata/basicdataVehicle';
 import { mapGetters } from 'vuex';
 import { exportBlob } from '@/api/common';
@@ -63,6 +64,7 @@ export default {
       search: {},
       loading: true,
       vehicleformdata: {},
+      dicDatas:[],
       edit: true, //修改
       page: {
         pageSize: 10,
@@ -70,7 +72,787 @@ export default {
         total: 0
       },
       selectionList: [],
-      option: option,
+      option: {
+        height:'auto',
+        calcHeight: 30,
+        tip: false,
+        searchShow: true,
+        searchMenuSpan: 6,
+        border: true,
+        index: true,
+        viewBtn: false,
+        editBtn: false,
+        selection: true,
+        dialogClickModal: false,
+        column: [
+          {
+            label: "主键",
+            prop: "id",
+            type: "input",
+            addDisplay: false,
+            editDisplay: false,
+            viewDisplay: false,
+            hide: true,
+          },
+          {
+            label: "租户号",
+            prop: "tenantId",
+            type: "input",
+            addDisplay: false,
+            editDisplay: false,
+            viewDisplay: false,
+            hide: true,
+          },
+          {
+            label: "创建人",
+            prop: "createUser",
+            type: "input",
+            addDisplay: false,
+            editDisplay: false,
+            viewDisplay: false,
+            hide: true,
+          },
+          {
+            label: "创建时间",
+            prop: "createTime",
+            type: "input",
+            addDisplay: false,
+            editDisplay: false,
+            viewDisplay: false,
+            hide: true,
+          },
+          {
+            label: "更新人",
+            prop: "updateUser",
+            type: "input",
+            addDisplay: false,
+            editDisplay: false,
+            viewDisplay: false,
+            hide: true,
+          },
+          {
+            label: "更新时间",
+            prop: "updateTime",
+            type: "input",
+            addDisplay: false,
+            editDisplay: false,
+            viewDisplay: false,
+            hide: true,
+          },
+          {
+            label: "状态",
+            prop: "status",
+            type: "input",
+            addDisplay: false,
+            editDisplay: false,
+            viewDisplay: false,
+            hide: true,
+          },
+          {
+            label: "是否已删除;1-未删除，2-已删除",
+            prop: "isDeleted",
+            type: "input",
+            addDisplay: false,
+            editDisplay: false,
+            viewDisplay: false,
+            hide: true,
+          },
+          {
+            label: "创建部门",
+            prop: "createDept",
+            type: "input",
+            addDisplay: false,
+            editDisplay: false,
+            viewDisplay: false,
+            hide: true,
+          },
+          {
+            label: "车牌号",
+            prop: "vehicleNub",
+            type: "input",
+            search: true,
+            labelWidth:'150',
+            width:"100px",
+            align:'center',
+            span:11,
+
+          },
+          {
+            label: "绑定驾驶人",
+            prop: "vehicleOwners",
+            type: "select",
+            labelWidth:'150',
+            width:"200px",
+            align:'center',
+            span:11,
+            multiple: true,
+            dicData: [],
+            // dicUrl: '/api/logpm-basicdata/vehicle/dictionary',
+            // props: {
+            //   label: 'vehicleNub',
+            //   value: 'id',
+            // },
+            // addDisplay: false,
+            // editDisplay: false,
+            // viewDisplay: false,
+            // hide: true,
+          },
+          {
+            label: "车辆来源",
+            prop: "vehicleSource",
+            type: "select",
+            search: true,
+            labelWidth:'150',
+            width:"100px",
+            align:'center',
+            span:11,
+            dicUrl: '/api/blade-system/dict-biz/dictionary?code=basic_vehicle_source',
+            props: {
+              label: 'dictValue',
+              value: 'dictKey',
+            },
+          },
+          {
+            label: "是否车头",
+            prop: "isHead",
+            type: "select",
+            labelWidth:'150',
+            width:"100px",
+            align:'center',
+            span:11,
+            dicUrl: '/api/blade-system/dict-biz/dictionary?code=yes_no',
+            props: {
+              label: 'dictValue',
+              value: 'dictKey',
+            },
+          },
+          {
+            label: "挂车类型",
+            prop: "trailerType",
+            type: "select",
+            search: true,
+            labelWidth:'150',
+            width:"100px",
+            align:'center',
+            span:11,
+            dicUrl: '/api/blade-system/dict-biz/dictionary?code=basic_trailer_type',
+            props: {
+              label: 'dictValue',
+              value: 'dictKey',
+            },
+          },
+          {
+            label: "车辆类型",
+            prop: "vehicleModel",
+            type: "select",
+            search: true,
+            labelWidth:'150',
+            width:"100px",
+            align:'center',
+            span:11,
+            dicUrl: '/api/blade-system/dict-biz/dictionary?code=basic_vehicle_model',
+            props: {
+              label: 'dictValue',
+              value: 'dictKey',
+            },
+          },
+          {
+            label: "车厢类型",
+            prop: "carType",
+            type: "select",
+            labelWidth:'150',
+            width:"100px",
+            align:'center',
+            span:11,
+            dicUrl: '/api/blade-system/dict-biz/dictionary?code= basic_car_type',
+            props: {
+              label: 'dictValue',
+              value: 'dictKey',
+            },
+          },
+          {
+            label: "车长(M)",
+            prop: "vehicleCommander",
+            type: "input",
+            labelWidth:'150',
+            width:"100px",
+            align:'center',
+            span:11,
+          },
+          {
+            label: "外廓高",
+            prop: "vehicleHeight",
+            type: "input",
+            labelWidth:'150',
+            width:"100px",
+            align:'center',
+            span:11,
+          },
+          {
+            label: "付款方式",
+            prop: "paymentMethod",
+            type: "select",
+            search: true,
+            labelWidth:'150',
+            width:"100px",
+            align:'center',
+            span:11,
+            filterable: true,
+            dicUrl: '/api/blade-system/dict-biz/dictionary?code=basicdata_vehicle_paymentmethod',
+            props: {
+              label: 'dictValue',
+              value: 'dictKey',
+            },
+          },
+          {
+            label: "核定体积",
+            prop: "approvedVolume",
+            type: "input",
+            labelWidth:'150',
+            width:"100px",
+            align:'center',
+            span:11,
+          },
+          {
+            label: "车牌颜色",
+            prop: "licensePlateColor",
+            type: "select",
+            labelWidth:'150',
+            width:"100px",
+            align:'center',
+            span:11,
+            dicUrl: '/api/blade-system/dict-biz/dictionary?code=basic_plate_color',
+            props: {
+              label: 'dictValue',
+              value: 'dictKey',
+            },
+          },
+          {
+            label: "车身颜色",
+            prop: "vehicleColor",
+            type: "select",
+            labelWidth:'150',
+            width:"100px",
+            align:'center',
+            span:11,
+            dicUrl: '/api/blade-system/dict-biz/dictionary?code=basic_vehicle_color',
+            props: {
+              label: 'dictValue',
+              value: 'dictKey',
+            },
+          },
+          {
+            label: "能源类型",
+            prop: "energyType",
+            type: "select",
+            labelWidth:'150',
+            width:"100px",
+            align:'center',
+            span:11,
+            dicUrl: '/api/blade-system/dict-biz/dictionary?code=basic_energy_type',
+            props: {
+              label: 'dictValue',
+              value: 'dictKey',
+            },
+          },
+          {
+            label: "车牌类型",
+            prop: "licensePlateType",
+            type: "select",
+            labelWidth:'150',
+            width:"100px",
+            align:'center',
+            span:11,
+            dicUrl: '/api/blade-system/dict-biz/dictionary?code=basic_plate_type',
+            props: {
+              label: 'dictValue',
+              value: 'dictKey',
+            },
+          },
+          {
+            label: "备注",
+            prop: "notes",
+            type: "input",
+            labelWidth:'150',
+            width:"100px",
+            align:'center',
+            span:11,
+          },
+          // {
+          //   label: "车辆所属人",
+          //   prop: "vehicleOwner",
+          //   type: "input",
+          //   labelWidth:'150',
+          //   width:"100px",
+          //   align:'center',
+          //   span:11,
+          // },
+          {
+            label: "品牌型号",
+            prop: "vehicleBrand",
+            type: "input",
+            labelWidth:'150',
+            width:"100px",
+            align:'center',
+            span:11,
+          },
+          {
+            label: "车辆代号",
+            prop: "vehicleCode",
+            type: "input",
+            labelWidth:'150',
+            width:"100px",
+            align:'center',
+            span:11,
+          },
+          {
+            label: "发动机型号",
+            prop: "engineCode",
+            type: "input",
+            labelWidth:'150',
+            width:"100px",
+            align:'center',
+            span:11,
+          },
+          {
+            label: "车辆总质量(T)",
+            prop: "vehicleQuality",
+            type: "input",
+            labelWidth:'150',
+            width:"120px",
+            align:'center',
+            span:11,
+          },
+          {
+            label: "整备质量(T)",
+            prop: "curbWeight",
+            type: "input",
+            labelWidth:'150',
+            width:"120px",
+            align:'center',
+            span:11,
+          },
+          {
+            label: "载荷质量(T)",
+            prop: "loadMass",
+            type: "input",
+            labelWidth:'150',
+            width:"120px",
+            align:'center',
+            span:11,
+          },
+          {
+            label: "外廓宽(M)",
+            prop: "outerWidth",
+            type: "input",
+            labelWidth:'150',
+            width:"120px",
+            align:'center',
+            span:11,
+          },
+          {
+            label: "到期时间",
+            prop: "expirationTime",
+            type: "input",
+            labelWidth:'150',
+            width:"100px",
+            align:'center',
+            span:11,
+          },
+          {
+            label: "道路运输证号",
+            prop: "roadTransport",
+            type: "input",
+            labelWidth:'150',
+            width:"150px",
+            align:'center',
+            span:11,
+          },
+          {
+            label: "经营许可证号",
+            prop: "businessLicense",
+            type: "input",
+            labelWidth:'150',
+            width:"150px",
+            align:'center',
+            span:11,
+          },
+          {
+            label: "车辆所属单位",
+            prop: "vehicleUnit",
+            type: "input",
+            labelWidth:'150',
+            width:"150px",
+            align:'center',
+            span:11,
+          },
+          {
+            label: "车辆所属单位电话",
+            prop: "vehicleUnitPhone",
+            type: "input",
+            labelWidth:'150',
+            width:"180px",
+            align:'center',
+            span:11,
+          },
+          {
+            label: "车辆所属人手机号",
+            prop: "vehicleOwnerPhone",
+            type: "input",
+            labelWidth:'150',
+            width:"180px",
+            align:'center',
+            span:11,
+          },
+          {
+            label: "车辆所属人身份证号",
+            prop: "vehicleOwnerCard",
+            type: "input",
+            labelWidth:'150',
+            width:"180px",
+            align:'center',
+            span:11,
+          },
+          {
+            label: "承运商",
+            prop: "carrierId",
+            type: "select",
+            labelWidth:'150',
+            width:"100px",
+            align:'center',
+            search: true,
+            span:11,
+            filterable: true,
+            dicUrl: '/api/logpm-basicdata/carrier/dictionary',
+            props: {
+              label: 'number',
+              value: 'id',
+            },
+            rules: [{ required: true, message: '请选择承运商!',trigger: 'blur'}],
+          },
+          {
+            label: "车辆年审时间",
+            prop: "reviewTime",
+            width:"120px",
+            align:'center',
+            type: "date",
+            format: "YYYY-MM-DD",
+            valueFormat: "YYYY-MM-DD",
+            labelWidth:'150',
+            span:11,
+          },
+          {
+            label: "车辆年审有效期",
+            prop: "reviewValidity",
+            type: "input",
+            labelWidth:'150',
+            width:"150px",
+            align:'center',
+            span:11,
+          },
+          {
+            label: "车辆保险开始时间",
+            prop: "insuranceStartTime",
+            type: "date",
+            format: "YYYY-MM-DD",
+            valueFormat: "YYYY-MM-DD",
+            labelWidth:'150',
+            width:"150px",
+            align:'center',
+            span:11,
+          },
+          {
+            label: "车辆保险结束时间",
+            prop: "insuranceEndTime",
+            type: "date",
+            format: "YYYY-MM-DD",
+            valueFormat: "YYYY-MM-DD",
+            labelWidth:'150',
+            width:"150px",
+            align:'center',
+            span:11,
+          },
+          {
+            label: "有无车身广告",
+            prop: "bodyAdvertising",
+            type: "select",
+            labelWidth:'150',
+            width:"150px",
+            align:'center',
+            span:11,
+            dicUrl: '/api/blade-system/dict-biz/dictionary?code=yes_no',
+            props: {
+              label: 'dictValue',
+              value: 'dictKey',
+            },
+          },
+          {
+            label: "车身广告更新时间",
+            prop: "advertisementsNewTimes",
+            type: "date",
+            format: "YYYY-MM-DD",
+            valueFormat: "YYYY-MM-DD",
+            labelWidth:'150',
+            width:"180px",
+            align:'center',
+            span:11,
+          },
+          // {
+          //   label: "车辆挂靠公司",
+          //   prop: "vehicleParkingCompany",
+          //   type: "input",
+          //   labelWidth:'150',
+          //   width:"150px",
+          //   align:'center',
+          //   span:11,
+          // },
+          {
+            label: "是否有GPS",
+            prop: "withGps",
+            type: "select",
+            labelWidth:'150',
+            width:"150px",
+            align:'center',
+            span:11,
+            dicUrl: '/api/blade-system/dict-biz/dictionary?code=yes_no',
+            props: {
+              label: 'dictValue',
+              value: 'dictKey',
+            },
+          },
+          {
+            label: "GPS服务商",
+            prop: "gpsServiceProvider",
+            type: "input",
+            labelWidth:'150',
+            width:"120px",
+            align:'center',
+            span:11,
+          },
+          {
+            label: "GPS型号",
+            prop: "gpsModel",
+            type: "input",
+            labelWidth:'150',
+            width:"120px",
+            align:'center',
+            span:11,
+          },
+          {
+            label: "行驶证正面照片",
+            prop: "drivingLicensePhoto",
+            type: "upload",
+            dataType: 'string',
+            listType: 'picture-img',
+            hide: true,
+            labelWidth:'150',
+            span:11,
+            multiple:false,
+            width:"200px",
+            align:'left',
+            action: '/blade-resource/oss/endpoint/put-file',
+            propsHttp: {
+              res: 'data',
+              url: 'link',
+            },
+          },
+          {
+            label: "行驶证照片反面",
+            prop: "drivingLicensePhotoBack",
+            type: "upload",
+            dataType: 'string',
+            listType: 'picture-img',
+            hide: true,
+            labelWidth:'150',
+            span:11,
+            multiple:false,
+            width:"200px",
+            align:'left',
+            action: '/blade-resource/oss/endpoint/put-file',
+            propsHttp: {
+              res: 'data',
+              url: 'link',
+            },
+          },
+          {
+            label: "许可证照片",
+            prop: "licensePhoto",
+            type: "upload",
+            dataType: 'string',
+            listType: 'picture-img',
+            hide: true,
+            labelWidth:'150',
+            span:11,
+            multiple:false,
+            width:"200px",
+            align:'left',
+            action: '/blade-resource/oss/endpoint/put-file',
+            propsHttp: {
+              res: 'data',
+              url: 'link',
+            },
+          },
+          {
+            label: "车辆照片(最新)",
+            prop: "vehiclePhoto",
+            type: 'upload',
+            listType: 'picture-img',
+            dataType: 'string',
+            labelWidth:'150',
+            span:11,
+            multiple:false,
+            width:"200px",
+            align:'left',
+            action: '/blade-resource/oss/endpoint/put-file',
+            // limit: 3,
+            propsHttp: {
+              res: 'data',
+              url: 'link',
+            },
+          },
+          {
+            label: "车尾照片",
+            prop: "vehicleRearPhoto",
+            type: 'upload',
+            listType: 'picture-img',
+            dataType: 'string',
+            labelWidth:'150',
+            span:11,
+            multiple:false,
+            width:"200px",
+            align:'left',
+            action: '/blade-resource/oss/endpoint/put-file',
+            // limit: 3,
+            propsHttp: {
+              res: 'data',
+              url: 'link',
+            },
+          },
+          {
+            label: "道路运输照片",
+            prop: "roadTransportPhoto",
+            type: "upload",
+            dataType: 'string',
+            listType: 'picture-img',
+            hide: true,
+            labelWidth:'150',
+            span:11,
+            multiple:false,
+            width:"200px",
+            align:'left',
+            action: '/blade-resource/oss/endpoint/put-file',
+            propsHttp: {
+              res: 'data',
+              url: 'link',
+            },
+          },
+          {
+            label: "人车合影照片",
+            prop: "vehiclePeoplePhoto",
+            type: "upload",
+            dataType: 'string',
+            listType: 'picture-img',
+            hide: true,
+            labelWidth:'150',
+            span:11,
+            multiple:false,
+            width:"200px",
+            align:'left',
+            action: '/blade-resource/oss/endpoint/put-file',
+            propsHttp: {
+              res: 'data',
+              url: 'link',
+            },
+          },
+          {
+            label: "保险卡照片",
+            prop: "insuranceCardPhoto",
+            type: "upload",
+            dataType: 'string',
+            listType: 'picture-img',
+            hide: true,
+            labelWidth:'150',
+            span:11,
+            multiple:false,
+            width:"200px",
+            align:'left',
+            action: '/blade-resource/oss/endpoint/put-file',
+            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",
+            prop: "reserve1",
+            type: "input",
+            addDisplay: false,
+            editDisplay: false,
+            viewDisplay: false,
+            hide: true,
+          },
+          {
+            label: "预留2",
+            prop: "reserve2",
+            type: "input",
+            addDisplay: false,
+            editDisplay: false,
+            viewDisplay: false,
+            hide: true,
+          },
+          {
+            label: "预留3",
+            prop: "reserve3",
+            type: "input",
+            addDisplay: false,
+            editDisplay: false,
+            viewDisplay: false,
+            hide: true,
+          },
+          {
+            label: "预留4",
+            prop: "reserve4",
+            type: "input",
+            addDisplay: false,
+            editDisplay: false,
+            viewDisplay: false,
+            hide: true,
+          },
+          {
+            label: "预留5",
+            prop: "reserve5",
+            type: "input",
+            addDisplay: false,
+            editDisplay: false,
+            viewDisplay: false,
+            hide: true,
+          },
+        ]
+      }
+      ,
       data: []
     };
   },
@@ -108,6 +890,7 @@ export default {
     },
     editDeline(row){
       console.log('row>>>>>>>>>>>>>>>', row);
+      console.log('this.dicDatas>>>>>>>>>>>>>>>', this.dicDatas);
       this.vehicleformdata = row;
       this.vehicleformdata.view =false;
       this.edit =false;
@@ -248,13 +1031,34 @@ export default {
         carrierId: carrierId
       };
 
-      getList(page.currentPage, page.pageSize, values).then(res => {
+      getPage(page.currentPage, page.pageSize, values).then(res => {
         const data = res.data.data;
         this.page.total = data.total;
         this.data = data.records;
+        this.option.column[10].dicData =[]
+        this.dicDatas =[]
+        //查询绑定人
+        this.getOwns();
         this.loading = false;
         this.selectionClear();
       });
+
+
+    },
+    //查询绑定人
+    getOwns(){
+      getOwn().then(res => {
+        console.log("res.data.data>>>>>>>",res.data.data)
+        res.data.data.map(v=>{
+          let value =
+            {
+              label: v.name,
+              value: v.id,
+            }
+          this.option.column[10].dicData.push(value)
+          this.dicDatas.push(value)
+        })
+      });
     }
   }
 };

src/views/basicdata/vehicle/basicdataVehicleform.vue

@@ -33,8 +33,12 @@ export default {
     vehicleformdata:{
       type:Object,
     },
+    dicDatas:{
+      type:[],
+    }
   },
   created(){
+    this.option.column[2].dicData=this.dicDatas
     if (!!this.vehicleformdata){this.initData()}
   },
   data() {
@@ -172,6 +176,26 @@ export default {
               value: 'dictKey',
             },
           },
+          {
+            label: "绑定驾驶人",
+            prop: "vehicleOwners",
+            type: "select",
+            labelWidth:'150',
+            width:"100px",
+            align:'center',
+            span:6,
+            multiple: true,
+            dicData: [],
+            // dicUrl: '/api/logpm-basicdata/vehicle/dictionary',
+            // props: {
+            //   label: 'vehicleNub',
+            //   value: 'id',
+            // },
+            // addDisplay: false,
+            // editDisplay: false,
+            // viewDisplay: false,
+            // hide: true,
+          },
           {
             label: "是否车头",
             prop: "isHead",

src/views/distribution/deliverylist/distributionDeliveryList.vue

@@ -56,6 +56,7 @@
             <template #="{row}">
               <el-button type="primary" text icon="el-icon-view" @click="handleView(row)">查看</el-button>
               <el-button type="primary" text icon="el-icon-view" @click="handleViewBlank(row)">查看</el-button>
+              <el-button type="primary" text icon="el-icon-view" @click="handleViewBlank(row)">查看地图</el-button>
 <!--              <el-button type="primary" text icon="el-icon-edit" @click="handleEdit(row)">编辑</el-button>-->
 <!--              <el-button type="primary" text icon="el-icon-delete" @click="rowDel(row)">删除</el-button>-->
             </template>