Merge branch 'dev' of http://git.echepei.com/caojunjie/Smart_platform_ui into dev

src/api/landTransportation/driver.js

@@ -46,3 +46,11 @@ export function driverUser(data) {
         data:data
     })
 }
+//到期查询
+export function driverRemind(data) {
+    return request({
+        url: '/api/blade-client/land-vehicle/remind',
+        method: 'get',
+        params:data
+    })
+}

src/api/landTransportation/index.js

@@ -169,10 +169,11 @@ export function borrow(data) {
     })
 }
 //获取车队司机信息
-export function fleetList() {
+export function fleetList(data) {
     return request({
         url: '/api/blade-client/land-vehicle/vehicle-list',
-        method: 'get'
+        method: 'get',
+        params:data
     })
 }
 //获取省市区

src/components/upload/index.vue

@@ -5,6 +5,7 @@
           :data="data"
           ref="crud"
           :option="option"
+          :key="key"
           @resetColumn="resetColumn"
           @saveColumn="saveColumn"
       >
@@ -284,6 +285,7 @@ export default {
       action: "/api/blade-resource/oss/endpoint/put-file",
       headers: { "Blade-Auth": "Bearer " + getToken() },
       option: {},
+      key:0,
       originalOptions: {
         dialogDrag: true,
         index: true,
@@ -343,6 +345,7 @@ export default {
      * 一定要执行异步操作，要等接口成功返回，才能执行下一行代码
      */
     this.option = await this.getColumnData(this.getColumnName(this.enumerationValue),this.originalOptions);
+    this.key++
   },
   methods: {
     //自定义列保存

src/views/basicData/landTransportation/driverInformation/index.vue

@@ -351,6 +351,19 @@ export default {
           cell: true,
           overHidden: true,
           search:true,
+        }, {
+          label: '信用等级',
+          width: 150,
+          span: 8,
+          prop: 'salesman',
+          search: true,
+          overHidden: true,
+          type: "select",
+          dicUrl: "/api/blade-system/dict-biz/dictionary?code=credit_rating",
+          props: {
+            label: "dictValue",
+            value: "dictKey"
+          },
         },{
           label: '附件',
           prop: 'fileList',
@@ -375,16 +388,16 @@ export default {
               }
             },
             column: [{
-              width: 200,
-              label: '文件名称',
-              prop: "fileName",
-              formslot: true
-            }, {
               width: 360,
               label: '文件地址',
               prop: "url"
             }, {
               width: 200,
+              label: '文件名称',
+              prop: "fileName",
+              formslot: true
+            },{
+              width: 200,
               label: '文件属性',
               type: "select",
               dicUrl: "/api/blade-system/dict-biz/dictionary?code=file_type",

src/views/basicData/landTransportation/vehicleInformation/index.vue

@@ -303,28 +303,41 @@ export default {
           cell: true,
           overHidden: true,
           search: true,
+          searchRange: true,
           span: 8,
           searchSpan: 8,
+          type: "date",
+          searchDefaultTime: ['00:00:00', '23:59:59'],
+          format: "yyyy-MM-dd",
+          valueFormat: "yyyy-MM-dd HH:mm:ss",
         }, {
           label: '注册日期',
           prop: 'registerDate',
           index: 17,
           width: 140,
-          cell: true,
           overHidden: true,
+          type: "date",
+          searchRange: true,
           search: true,
           span: 8,
           searchSpan: 8,
+          searchDefaultTime: ['00:00:00', '23:59:59'],
+          format: "yyyy-MM-dd",
+          valueFormat: "yyyy-MM-dd HH:mm:ss",
         }, {
           label: '报废日期',
           prop: 'scrapDate',
           index: 18,
           width: 140,
-          cell: true,
           overHidden: true,
           search: true,
+          searchRange: true,
           span: 8,
           searchSpan: 8,
+          type: "date",
+          searchDefaultTime: ['00:00:00', '23:59:59'],
+          format: "yyyy-MM-dd",
+          valueFormat: "yyyy-MM-dd HH:mm:ss",
         }, {
           label: '外廓尺寸mm',
           prop: 'oto',
@@ -365,6 +378,43 @@ export default {
           search: true,
           span: 8,
           searchSpan: 8,
+        }, {
+          label: '年审',
+          prop: 'inspectExpired',
+          overHidden: true,
+          type: "date",
+          searchRange: true,
+          search: true,
+          span: 8,
+          searchSpan: 8,
+          searchDefaultTime: ['00:00:00', '23:59:59'],
+          format: "yyyy-MM-dd",
+          valueFormat: "yyyy-MM-dd HH:mm:ss",
+        }, {
+          label: '保险',
+          prop: 'insuranceExpired',
+          overHidden: true,
+          type: "date",
+          searchRange: true,
+          search: true,
+          span: 8,
+          searchSpan: 8,
+          searchDefaultTime: ['00:00:00', '23:59:59'],
+          format: "yyyy-MM-dd",
+          valueFormat: "yyyy-MM-dd HH:mm:ss",
+        }, {
+          label: '信用等级',
+          width: 150,
+          span: 8,
+          prop: 'salesman',
+          search: true,
+          overHidden: true,
+          type: "select",
+          dicUrl: "/api/blade-system/dict-biz/dictionary?code=credit_rating",
+          props: {
+            label: "dictValue",
+            value: "dictKey"
+          },
         },
           {
             label: '附件',
@@ -391,15 +441,15 @@ export default {
                 }
               },
               column: [{
+                width: 360,
+                label: '文件地址',
+                prop: "url"
+              }, {
                 width: 200,
                 label: '文件名称',
                 prop: "fileName",
                 formslot: true
               }, {
-                width: 360,
-                label: '文件地址',
-                prop: "url"
-              }, {
                 width: 200,
                 label: '文件属性',
                 type: "select",

src/views/basicData/portinformation/configuration/mainList.json

@@ -18,7 +18,7 @@
   "menuWidth": 220,
   "column": [
     {
-      "label": "港口编号",
+      "label": "地点编号",
       "prop": "code",
       "width": 150,
       "index": 1,
@@ -31,7 +31,7 @@
       ]
     },
     {
-      "label": "港口名称",
+      "label": "地点名称",
       "prop": "name",
       "search": true,
       "width": 150,
@@ -49,7 +49,7 @@
       "width": 150
     },
     {
-      "label": "港口类型",
+      "label": "地点类型",
       "prop": "typeId",
       "dicData": [],
       "type": "tree",

src/views/landTransportation/dispatchingCars/detailPage.vue

@@ -811,10 +811,36 @@ export default {
           index: 5,
           prop: 'fleetId'
         }, {
+          label: '车号',
+          width: 150,
+          index: 6,
+          prop: 'plateNo'
+        }, {
+          label: '司机',
+          width: 115,
+          index: 7,
+          prop: 'driverName'
+        }, {
+          label: '电话',
+          width: 160,
+          index: 8,
+          prop: 'tel'
+        }, {
+          label: '完工日期',
+          prop: 'finishedTime',
+          overHidden: true,
+          type: "date",
+          searchRange: true,
+          defaultTime: ['00:00:00', '23:59:59'],
+          format: "yyyy-MM-dd HH:mm:ss",
+          valueFormat: "yyyy-MM-dd HH:mm:ss",
+          index: 9,
+          width: 140,
+        }, {
           label: '货物名称',
           overHidden: true,
           width: 160,
-          index: 6,
+          index: 10,
           prop: 'goods'
         }, {
           label: '件数',
@@ -822,7 +848,7 @@ export default {
           overHidden: true,
           controls: false,
           cell: true,
-          index: 7,
+          index: 11,
           prop: 'quantity',
           type: 'number',
           precision: 0
@@ -846,39 +872,24 @@ export default {
             prop: 'landWeight',
             controls: false,
             precision: 2,
-            index: 8,
+            index: 12,
             type: 'number'
           }, {
             label: '尺码',
             width: 100,
             overHidden: true,
             cell: true,
-            index: 9,
+            index: 13,
             prop: 'size',
           }, {
-            label: '车号',
-            width: 150,
-            index: 10,
-            prop: 'plateNo'
-          }, {
-            label: '司机',
-            width: 115,
-            index: 11,
-            prop: 'driverName'
-          }, {
-            label: '电话',
-            width: 160,
-            index: 12,
-            prop: 'tel'
-          }, {
             label: '单柜运费',
-            index: 13,
+            index: 14,
             prop: 'landAmountD'
           },
           {
             label: '状态',
             width: 100,
-            index: 14,
+            index: 15,
             type: 'select',
             dicUrl: "/api/blade-system/dict-biz/dictionary?code=land_order_status",
             props: {
@@ -890,28 +901,28 @@ export default {
           }, {
             label: '应付陆运费',
             cell: true,
-            index: 15,
+            index: 16,
             prop: 'landAmountC'
           }, {
             label: '委托备注',
             width: 245,
-            index: 16,
+            index: 17,
             prop: 'remarks'
           }, {
             label: '车队备注',
             width: 245,
-            index: 17,
+            index: 18,
             prop: 'fleetRemarks'
           }, {
             label: '司机备注',
             width: 245,
-            index: 18,
+            index: 19,
             prop: 'driverRemarks'
           }, {
             label: '应收场站费',
             width: 100,
             precision: 2,
-            index: 19,
+            index: 20,
             controls: false,
             cell: true,
             type: 'number',
@@ -921,14 +932,14 @@ export default {
             width: 100,
             precision: 2,
             cell: true,
-            index: 20,
+            index: 21,
             controls: false,
             type: 'number',
             prop: 'twoFeeD'
           }, {
             label: '应收扣款',
             width: 100,
-            index: 21,
+            index: 22,
             precision: 2,
             cell: true,
             controls: false,
@@ -938,7 +949,7 @@ export default {
             label: '应收待时费',
             width: 100,
             precision: 2,
-            index: 22,
+            index: 23,
             cell: true,
             controls: false,
             type: 'number',
@@ -946,7 +957,7 @@ export default {
           }, {
             label: '应收其他',
             width: 100,
-            index: 23,
+            index: 24,
             precision: 2,
             cell: true,
             type: 'number',
@@ -955,13 +966,13 @@ export default {
           }, {
             label: '应收费用备注',
             width: 245,
-            index: 24,
+            index: 25,
             cell: true,
             prop: 'feeRemarksD'
           }, {
             label: '应付场站费',
             width: 100,
-            index: 25,
+            index: 26,
             precision: 2,
             cell: true,
             controls: false,
@@ -971,7 +982,7 @@ export default {
             label: '应付港杂费',
             width: 100,
             precision: 2,
-            index: 26,
+            index: 27,
             cell: true,
             controls: false,
             type: 'number',
@@ -979,7 +990,7 @@ export default {
           }, {
             label: '应付扣款',
             width: 100,
-            index: 27,
+            index: 28,
             precision: 2,
             controls: false,
             type: 'number',
@@ -989,7 +1000,7 @@ export default {
             label: '应付待时费',
             width: 100,
             precision: 2,
-            index: 28,
+            index: 29,
             controls: false,
             cell: true,
             type: 'number',
@@ -998,7 +1009,7 @@ export default {
             label: '应付其他',
             width: 100,
             precision: 2,
-            index: 29,
+            index: 30,
             type: 'number',
             cell: true,
             controls: false,
@@ -1006,7 +1017,7 @@ export default {
           }, {
             label: '应付费用备注',
             width: 245,
-            index: 30,
+            index: 31,
             cell: true,
             prop: 'feeRemarksC'
           }
@@ -1428,7 +1439,8 @@ export default {
     queryVehicle({orderId: this.id}).then(res => {
       const column = this.findObject(this.collectionOption.column, "plateNo");
       const columnTwo = this.findObject(this.paymentOption.column, "plateNo");
-      column.dicData = columnTwo.dicData = []
+      column.dicData = []
+      columnTwo.dicData = []
       res.data.data.forEach(item => {
         column.dicData.push({label: item})
         columnTwo.dicData.push({label: item})

src/views/landTransportation/dispatchingCars/index.vue

@@ -390,6 +390,7 @@ export default {
     },
     backToList() {
       this.show = true
+      this.onLoad(this.page)
     },
     //切换订单状态
     handleClick(tab) {

src/views/landTransportation/driver/index.vue

@@ -278,11 +278,29 @@ export default {
           index: 4,
           width: 140,
           search: true,
+        },{
+          label: '箱型',
+          width: 100,
+          search: true,
+          index: 5,
+          overHidden: true,
+          prop: 'ctnType',
+          type: 'select',
+          dicUrl: "/api/blade-system/dict-biz/dictionary?code=boxType",
+          props: {
+            label: "dictValue",
+            value: "dictValue"
+          },
+        }, {
+          label: '箱量',
+          width: 50,
+          index: 6,
+          prop: 'ctnQuantity'
         },  {
           label: '车队',
           width: 200,
           search: true,
-          index:5,
+          index:7,
           overHidden: true,
           prop: 'fleetId'
         },{
@@ -290,7 +308,7 @@ export default {
           width: 150,
           prop: 'plateNo',
           overHidden: true,
-          index:6,
+          index:8,
           type: 'select',
           search: true,
           dicUrl: "/api/blade-client/land-vehicle/vehicle-list?fleetId={{key}}",
@@ -301,7 +319,7 @@ export default {
         }, {
           label: '司机',
           width: 115,
-          index:7,
+          index:9,
           search: true,
           overHidden: true,
           prop: 'driverId',
@@ -314,14 +332,14 @@ export default {
         }, {
           label: '电话',
           width: 160,
-          index:8,
+          index:10,
           overHidden: true,
           search: true,
           prop: 'tel'
         }, {
           label: '平台号',
           width: 100,
-          index: 9,
+          index: 11,
           search: true,
           overHidden: true,
           prop: 'orderNo'
@@ -329,7 +347,7 @@ export default {
           label: '箱号',
           cell: true,
           width: 245,
-          index: 10,
+          index: 12,
           overHidden: true,
           search: true,
           prop: 'ctnNo'
@@ -342,7 +360,7 @@ export default {
           defaultTime: ['00:00:00', '23:59:59'],
           format: "yyyy-MM-dd HH:mm:ss",
           valueFormat: "yyyy-MM-dd HH:mm:ss",
-          index: 11,
+          index: 13,
           width: 140
         },{
           label: '受理日期',
@@ -350,7 +368,7 @@ export default {
           format: 'yyyy-MM-dd HH:mm:ss',
           valueFormat: 'yyyy-MM-dd HH:mm:ss',
           width: 200,
-          index: 12,
+          index: 14,
           prop: 'acceptTime'
         },{
           label: '提箱时间',
@@ -358,7 +376,7 @@ export default {
           format: 'yyyy-MM-dd HH:mm:ss',
           valueFormat: 'yyyy-MM-dd HH:mm:ss',
           width: 200,
-          index: 12,
+          index: 15,
           prop: 'acceptTime'
         },{
           label: '完工日期',
@@ -369,39 +387,21 @@ export default {
           defaultTime: ['00:00:00', '23:59:59'],
           format: "yyyy-MM-dd HH:mm:ss",
           valueFormat: "yyyy-MM-dd HH:mm:ss",
-          index:13,
+          index:16,
           width: 140,
           // search: true,
         },{
-          label: '箱型',
-          width: 100,
-          search: true,
-          index: 14,
-          overHidden: true,
-          prop: 'ctnType',
-          type: 'select',
-          dicUrl: "/api/blade-system/dict-biz/dictionary?code=boxType",
-          props: {
-            label: "dictValue",
-            value: "dictValue"
-          },
-        }, {
-          label: '箱量',
-          width: 50,
-          index: 15,
-          prop: 'ctnQuantity'
-        },{
           label: '货物名称',
           overHidden: true,
           width: 160,
           search: true,
-          index: 16,
+          index: 17,
           prop: 'goods'
         }, {
           label: '件数',
           width: 100,
           search: true,
-          index: 17,
+          index: 18,
           overHidden: true,
           controls: false,
           cell: true,
@@ -414,47 +414,47 @@ export default {
           prop: 'landWeight',
           controls: false,
           overHidden: true,
-          index: 18,
+          index: 19,
           precision: 2,
           type: 'number'
         },{
           label: '尺码',
           width: 100,
           // search: true,
-          index:19,
+          index:20,
           overHidden: true,
           cell: true,
           prop: 'size',
         }, {
           label: '应付陆运费',
           overHidden: true,
-          index: 20,
+          index: 21,
           prop: 'landAmountC'
         }, {
           label: '委托备注',
           overHidden: true,
           width: 245,
-          index: 21,
+          index: 22,
           prop: 'remarks'
         }, {
           label: '车队备注',
           overHidden: true,
           width: 245,
-          index: 22,
+          index: 23,
           prop: 'fleetRemarks'
         }, {
           label: '司机备注',
           overHidden: true,
           cell: true,
           width: 245,
-          index: 23,
+          index: 24,
           prop: 'driverRemarks'
         },{
           label: '场站费',
           width: 100,
           precision: 2,
           cell: true,
-          index: 24,
+          index: 25,
           controls: false,
           type: 'number',
           prop: 'oneFeeC'
@@ -463,7 +463,7 @@ export default {
           width: 100,
           precision: 2,
           cell: true,
-          index: 25,
+          index: 26,
           controls: false,
           type: 'number',
           prop: 'twoFeeC'
@@ -472,14 +472,14 @@ export default {
           width: 100,
           precision: 2,
           cell: true,
-          index: 26,
+          index: 27,
           controls: false,
           type: 'number',
           prop: 'threeFeeC'
         }, {
           label: '待时费',
           width: 100,
-          index: 27,
+          index: 28,
           precision: 2,
           cell: true,
           controls: false,
@@ -489,7 +489,7 @@ export default {
           label: '其他',
           width: 100,
           precision: 2,
-          index: 28,
+          index: 29,
           cell: true,
           type: 'number',
           controls: false,
@@ -497,7 +497,7 @@ export default {
         }, {
           label: '费用备注',
           width: 245,
-          index: 29,
+          index: 30,
           cell: true,
           prop: 'feeRemarksC'
         },{
@@ -509,21 +509,21 @@ export default {
           defaultTime: ['00:00:00', '23:59:59'],
           format: "yyyy-MM-dd HH:mm:ss",
           valueFormat: "yyyy-MM-dd HH:mm:ss",
-          index: 30,
+          index: 31,
           width: 140,
           search: true,
         },{
           label: '船名航次',
           prop: 'factory',
           overHidden: true,
-          index: 31,
+          index: 32,
           width: 140,
           search: true,
         },{
           label: '状态',
           width: 100,
           type: 'select',
-          index:32,
+          index:33,
           overHidden: true,
           dicUrl: "/api/blade-system/dict-biz/dictionary?code=land_order_status",
           props: {

src/views/landTransportation/motorcadeDriver/index.vue

@@ -385,12 +385,31 @@ export default {
           index: 4,
           width: 140,
           search: true,
+        }, {
+          label: '箱型',
+          width: 100,
+          index: 5,
+          search: true,
+          overHidden: true,
+          prop: 'ctnType',
+          type: 'select',
+          dicUrl: "/api/blade-system/dict-biz/dictionary?code=boxType",
+          props: {
+            label: "dictValue",
+            value: "dictValue"
+          }
+        }, {
+          label: '箱量',
+          width: 50,
+          index: 6,
+          overHidden: true,
+          prop: 'ctnQuantity'
         },
           {
             label: '车队',
             width: 200,
             search: true,
-            index: 5,
+            index: 7,
             // hide:true,
             showColumn: false,
             filterable: true,
@@ -411,7 +430,7 @@ export default {
             width: 150,
             cell: true,
             search: true,
-            index: 6,
+            index: 8,
             allowCreate: true,
             prop: 'plateNo',
             overHidden: true,
@@ -431,7 +450,7 @@ export default {
             overHidden: true,
             cell: true,
             filterable: true,
-            index: 7,
+            index: 9,
             prop: 'driverId',
             type: 'select',
             dicUrl: "/api/blade-client/land-driver/driver-list?plateNo={{key}}",
@@ -445,12 +464,12 @@ export default {
             width: 160,
             search: true,
             cell: true,
-            index: 8,
+            index: 10,
             prop: 'tel'
           }, {
             label: '平台号',
             width: 100,
-            index: 9,
+            index: 11,
             search: true,
             overHidden: true,
             prop: 'orderNo'
@@ -458,7 +477,7 @@ export default {
             label: '箱号',
             overHidden: true,
             width: 245,
-            index: 10,
+            index: 12,
             search: true,
             prop: 'ctnNo'
           },{
@@ -470,7 +489,7 @@ export default {
             defaultTime: ['00:00:00', '23:59:59'],
             format: "yyyy-MM-dd HH:mm:ss",
             valueFormat: "yyyy-MM-dd HH:mm:ss",
-            index: 11,
+            index: 13,
             width: 140
           },{
             label: '受理日期',
@@ -478,7 +497,7 @@ export default {
             format: 'yyyy-MM-dd HH:mm:ss',
             valueFormat: 'yyyy-MM-dd HH:mm:ss',
             width: 200,
-            index: 12,
+            index: 14,
             prop: 'acceptTime'
           },{
             label: '完工日期',
@@ -489,27 +508,8 @@ export default {
             defaultTime: ['00:00:00', '23:59:59'],
             format: "yyyy-MM-dd HH:mm:ss",
             valueFormat: "yyyy-MM-dd HH:mm:ss",
-            index:13,
+            index:15,
             width: 140,
-          }, {
-            label: '箱型',
-            width: 100,
-            index: 14,
-            search: true,
-            overHidden: true,
-            prop: 'ctnType',
-            type: 'select',
-            dicUrl: "/api/blade-system/dict-biz/dictionary?code=boxType",
-            props: {
-              label: "dictValue",
-              value: "dictValue"
-            }
-          }, {
-            label: '箱量',
-            width: 50,
-            index: 15,
-            overHidden: true,
-            prop: 'ctnQuantity'
           },{
             label: '货物名称',
             overHidden: true,
@@ -687,7 +687,7 @@ export default {
     this.entrustOptionTwoT = await this.getColumnData(this.getColumnName(87), this.optionList);
     this.key++
     this.findObject(this.entrustOptionTwoT.column, "plateNo").change = (data) => {
-      fleetList().then(res => {
+      fleetList({fleetId:data.row.fleetId}).then(res => {
         for (let item in res.data.data) {
           if (data.value === res.data.data[item].plateNo) {
             this.goodsList[data.index].driverId = res.data.data[item].driverId

src/views/landTransportation/placeAnOrder/detailPage.vue

@@ -629,6 +629,21 @@ export default {
           index:3,
           width: 140,
         }, {
+          label: '车号',
+          width: 150,
+          index:4,
+          prop: 'plateNo'
+        }, {
+          label: '司机',
+          width: 115,
+          index:5,
+          prop: 'driverName'
+        }, {
+          label: '电话',
+          width: 160,
+          index:6,
+          prop: 'tel'
+        }, {
           label: '完工日期',
           prop: 'finishedTime',
           overHidden: true,
@@ -637,24 +652,24 @@ export default {
           defaultTime: ['00:00:00', '23:59:59'],
           format: "yyyy-MM-dd HH:mm:ss",
           valueFormat: "yyyy-MM-dd HH:mm:ss",
-          index: 4,
+          index: 7,
           width: 140,
         }, {
           label: '箱型',
           width: 100,
           slot: true,
-          index: 5,
+          index: 8,
           prop: 'ctnType'
         }, {
           label: '箱量',
           width: 50,
-          index: 6,
+          index: 9,
           prop: 'ctnQuantity'
         }, {
           label: '货物名称',
           overHidden: true,
           width: 160,
-          index: 7,
+          index: 10,
           prop: 'goods'
         }, {
           label: '件数',
@@ -662,7 +677,7 @@ export default {
           overHidden: true,
           controls: false,
           cell: true,
-          index: 8,
+          index: 11,
           prop: 'quantity',
           type: 'number',
           precision: 0
@@ -672,23 +687,23 @@ export default {
           prop: 'landWeight',
           controls: false,
           precision: 2,
-          index: 9,
+          index: 12,
           type: 'number'
         }, {
           label: '尺码',
           width: 100,
           overHidden: true,
-          index: 10,
+          index: 13,
           prop: 'size',
         }, {
           label: '委托备注',
           width: 245,
-          index: 11,
+          index: 14,
           prop: 'remarks'
         }, {
           label: '状态',
           width: 100,
-          index: 12,
+          index: 15,
           type: 'select',
           dicUrl: "/api/blade-system/dict-biz/dictionary?code=land_order_status",
           props: {
@@ -704,18 +719,6 @@ export default {
           //   prop: 'landAmountC'
           // }
           // , {
-          //   label: '车号',
-          //   width: 150,
-          //   prop: 'plateNo'
-          // }, {
-          //   label: '司机',
-          //   width: 115,
-          //   prop: 'driverName'
-          // }, {
-          //   label: '电话',
-          //   width: 160,
-          //   prop: 'tel'
-          // }, {
           //   label: '车队备注',
           //   width: 245,
           //   prop: 'fleetRemarks'

src/views/landTransportation/placeAnOrder/index.vue

@@ -469,6 +469,7 @@ export default {
     backToList() {
       this.id = ''
       this.show = true
+      this.onLoad(this.page)
     },
     ToBreak (val) {
       if (val)return val.replace(/\n/g, '<br/>')

src/views/landTransportation/reportAnalysis/index.vue

@@ -53,7 +53,7 @@
           title="杂费明细"
           :visible.sync="incidentalType"
           append-to-body
-          width="80%">
+          width="50%">
         <avue-crud
             :data="collectionList"
             :option="collectionOption"
@@ -173,58 +173,23 @@ export default {
           type: 'sum',
           decimals: 0
         }],
-        column: [{
-          label: '公司名称',
-          slot: true,
-          width: 200,
-          overHidden: true,
-          prop: 'corpName'
-        }, {
-          label: '费用名称',
-          slot: true,
-          width: 160,
-          prop: 'feeName'
-        }, {
-          label: '计价单位',
-          cell: true,
-          prop: 'unit',
-          type: "select",
-          dicUrl: "/api/blade-system/dict-biz/dictionary?code=unit",
-          props: {
-            label: "dictValue",
-            value: "dictKey"
+        column: [
+          {
+            label: '费用名称',
+            slot: true,
+            width: 160,
+            prop: 'feeName'
+          }, {
+            label: '金额',
+            cell: true,
+            prop: 'amount'
+          }, {
+            label: '车号',
+            prop: 'plateNo'
+          }, {
+            label: '备注',
+            prop: 'remarks'
           }
-        }, {
-          label: '数量',
-          cell: true,
-          prop: 'quantity'
-        }, {
-          label: '单价',
-          cell: true,
-          prop: 'price'
-        }, {
-          label: '金额',
-          cell: true,
-          prop: 'amount'
-        }, {
-          // label: '税率(默认6)',
-          label: '税率',
-          cell: true,
-          prop: 'taxRate'
-        }, {
-          label: '币别',
-          cell: true,
-          prop: 'currency',
-          type: "select",
-          dicUrl: "/api/blade-system/dict-biz/dictionary?code=currency",
-          props: {
-            label: "dictValue",
-            value: "dictKey"
-          },
-        }, {
-          label: '车号',
-          prop: 'plateNo'
-        }
         ]
       },
       collectionOption: {},
@@ -425,7 +390,6 @@ export default {
     this.goodsOptionCrud = await this.getColumnData(this.getColumnName(88.1), this.optionList);
     this.collectionOption = await this.getColumnData(this.getColumnName(88.2), this.collectionOptionBackup);
     this.roleName.forEach(item =>{
-      console.log(item);
       if (item == '客户'){
         return this.goodsOptionCrud.menu = true
       }else if (item == '平台') {
@@ -449,7 +413,7 @@ export default {
           prop: 'profit'
         })
       }else {
-        return this.goodsOptionCrud.menu = false
+        return this.goodsOptionCrud.menu = false;
       }
     })
     this.key++

src/views/wel/home/landTransportation/components/quick-launch.vue

@@ -27,16 +27,68 @@
           <i class="tradingIcon icon-sales" style="color:#143056"></i>
           <span>台账</span>
         </div>
+        <div class="content-icon" @click="inPage('dqtx')">
+          <div style="width: 36px;height: 36px;background-color: #3a8ee6;border-radius: 5px;line-height: 36px;text-align: center;padding-top: 4px">
+            <i class="el-icon-bell" style="color:#fff;font-size: 28px;"></i>
+          </div>
+          <span>到期提醒</span>
+        </div>
       </div>
     </el-card>
+    <el-dialog
+        title="消息提醒"
+        :visible.sync="enclosure"
+        append-to-body
+        width="70%">
+      <avue-crud :data="data" @on-load="onLoad" :option="option" :page.sync="page"></avue-crud>
+      <span slot="footer" class="dialog-footer">
+          <el-button @click="enclosure = false" size="small">取 消</el-button>
+        </span>
+    </el-dialog>
   </div>
 </template>
 
 <script>
+import {driverRemind} from "@/api/landTransportation/driver";
+
 export default {
   name: "basicContainer",
   data() {
-    return {};
+    return {
+      enclosure:false,
+      data:[],
+      option:{
+        align:'center',
+        dialogWidth:'85%',
+        index: true,
+        searchIcon: true,
+        addBtn:false,
+        searchIndex: 2,
+        menu:false,
+        refreshBtn:false,
+        searchLabelWidth:100,
+        searchSpan:8,
+        column:[{
+          label: '车队',
+          prop: 'fleetName',
+        },{
+          label: '车号',
+          prop: 'plateNo',
+        },{
+          label: '司机',
+          prop: 'driverName',
+        },{
+          label: '电话',
+          prop: 'tel',
+        },{
+          label: '年审日期',
+          prop: 'inspectExpired',
+        },{
+          label: '保险日期',
+          prop: 'insuranceExpired',
+        }]
+      }
+    };
   },
   props: {
     sysType: Number
@@ -59,7 +111,16 @@ export default {
         case "lytz":
           this.$router.push("/landTransportation/reportAnalysis/index");
           break;
+        case "dqtx":
+          this.enclosure = true
+          break;
       }
+    },
+    //查询
+    onLoad() {
+      driverRemind().then(res=>{
+        this.data = res.data.data
+      })
     }
   }
 };