提交陆运所有日期保留分

src/views/landTransportation/dispatchingCars/detailPage.vue

@@ -822,7 +822,7 @@ export default {
           type: "date",
           searchRange: true,
           defaultTime: ['00:00:00', '23:59:59'],
-          format: "yyyy-MM-dd HH:mm:ss",
+          format: "yyyy-MM-dd HH:mm",
           valueFormat: "yyyy-MM-dd HH:mm:ss",
           index: 2,
           width: 140,
@@ -864,7 +864,7 @@ export default {
           type: "date",
           searchRange: true,
           defaultTime: ['00:00:00', '23:59:59'],
-          format: "yyyy-MM-dd HH:mm:ss",
+          format: "yyyy-MM-dd HH:mm",
           valueFormat: "yyyy-MM-dd HH:mm:ss",
           index: 9,
           width: 140,
@@ -1417,13 +1417,6 @@ export default {
             props: {
               label: "label",
               value: "label"
-            },
-            dicFormatter:(data)=>{
-              let list = []
-              data.data.forEach(ele=>{
-                list.push({label:ele})
-              })
-              return list
             }
           }, {
             label: '费用名称',
@@ -1483,6 +1476,13 @@ export default {
     this.paymentOption = await this.getColumnData(this.getColumnName(86.5), this.paymentOptionBackup);
     this.findObject(this.paymentOption.column, "fleetId").dicUrl = "/api/blade-land/order-fee/fleet?orderId=" + this.id
     this.findObject(this.paymentOption.column, "plateNo").dicUrl = "api/blade-land/order-fee/plate-no?orderId=" + this.id + '&fleetId={{key}}'
+    this.findObject(this.paymentOption.column, "plateNo").dicFormatter = (data)=>{
+      let list = []
+      data.data.forEach(ele=>{
+        list.push({label:ele})
+      })
+      return list
+    }
     // price
     // quantity
     this.findObject(this.collectionOption.column, "price").change = (data) => {

src/views/landTransportation/dispatchingCars/index.vue

@@ -262,7 +262,7 @@ export default {
             type: "date",
             searchRange: true,
             defaultTime:['00:00:00', '23:59:59'],
-            format: "yyyy-MM-dd HH:mm:ss",
+            format: "yyyy-MM-dd HH:mm",
             valueFormat: "yyyy-MM-dd HH:mm:ss",
             index: 15,
             width: 140,

src/views/landTransportation/driver/index.vue

@@ -367,7 +367,7 @@ export default {
         },{
           label: '受理日期',
           type: "datetime",
-          format: 'yyyy-MM-dd HH:mm:ss',
+          format: 'yyyy-MM-dd HH:mm',
           valueFormat: 'yyyy-MM-dd HH:mm:ss',
           width: 200,
           index: 14,
@@ -375,7 +375,7 @@ export default {
         },{
           label: '提箱时间',
           type: "borrowTime",
-          format: 'yyyy-MM-dd HH:mm:ss',
+          format: 'yyyy-MM-dd HH:mm',
           valueFormat: 'yyyy-MM-dd HH:mm:ss',
           width: 200,
           index: 15,
@@ -387,7 +387,7 @@ export default {
           type: "date",
           searchRange: true,
           defaultTime: ['00:00:00', '23:59:59'],
-          format: "yyyy-MM-dd HH:mm:ss",
+          format: "yyyy-MM-dd HH:mm",
           valueFormat: "yyyy-MM-dd HH:mm:ss",
           index:16,
           width: 140,
@@ -509,7 +509,7 @@ export default {
           type: "date",
           searchRange: true,
           defaultTime: ['00:00:00', '23:59:59'],
-          format: "yyyy-MM-dd HH:mm:ss",
+          format: "yyyy-MM-dd HH:mm",
           valueFormat: "yyyy-MM-dd HH:mm:ss",
           index: 31,
           width: 140,

src/views/landTransportation/motorcadeDriver/index.vue

@@ -502,14 +502,14 @@ export default {
             type: "date",
             searchRange: true,
             defaultTime: ['00:00:00', '23:59:59'],
-            format: "yyyy-MM-dd HH:mm:ss",
+            format: "yyyy-MM-dd HH:mm",
             valueFormat: "yyyy-MM-dd HH:mm:ss",
             index: 13,
             width: 140
           },{
             label: '受理日期',
             type: "datetime",
-            format: 'yyyy-MM-dd HH:mm:ss',
+            format: 'yyyy-MM-dd HH:mm',
             valueFormat: 'yyyy-MM-dd HH:mm:ss',
             width: 200,
             index: 14,
@@ -521,7 +521,7 @@ export default {
             type: "date",
             searchRange: true,
             defaultTime: ['00:00:00', '23:59:59'],
-            format: "yyyy-MM-dd HH:mm:ss",
+            format: "yyyy-MM-dd HH:mm",
             valueFormat: "yyyy-MM-dd HH:mm:ss",
             index:15,
             width: 140,
@@ -666,7 +666,7 @@ export default {
             type: "date",
             searchRange: true,
             defaultTime: ['00:00:00', '23:59:59'],
-            format: "yyyy-MM-dd HH:mm:ss",
+            format: "yyyy-MM-dd HH:mm",
             valueFormat: "yyyy-MM-dd HH:mm:ss",
             index: 30,
             width: 145,

src/views/landTransportation/placeAnOrder/detailPage.vue

@@ -646,7 +646,7 @@ export default {
         column: [{
           label: '货运日期',
           type: "datetime",
-          format: 'yyyy-MM-dd HH:mm:ss',
+          format: 'yyyy-MM-dd HH:mm',
           valueFormat: 'yyyy-MM-dd HH:mm:ss',
           width: 200,
           index: 1,
@@ -654,7 +654,7 @@ export default {
         }, {
           label: '受理日期',
           type: "datetime",
-          format: 'yyyy-MM-dd HH:mm:ss',
+          format: 'yyyy-MM-dd HH:mm',
           valueFormat: 'yyyy-MM-dd HH:mm:ss',
           width: 200,
           index: 2,
@@ -666,7 +666,7 @@ export default {
           type: "date",
           searchRange: true,
           defaultTime: ['00:00:00', '23:59:59'],
-          format: "yyyy-MM-dd HH:mm:ss",
+          format: "yyyy-MM-dd HH:mm",
           valueFormat: "yyyy-MM-dd HH:mm:ss",
           index: 3,
           width: 140,
@@ -692,7 +692,7 @@ export default {
           type: "date",
           searchRange: true,
           defaultTime: ['00:00:00', '23:59:59'],
-          format: "yyyy-MM-dd HH:mm:ss",
+          format: "yyyy-MM-dd HH:mm",
           valueFormat: "yyyy-MM-dd HH:mm:ss",
           index: 7,
           width: 140,
@@ -845,7 +845,7 @@ export default {
         column: [{
           label: '货运日期',
           type: "datetime",
-          format: 'yyyy-MM-dd HH:mm:ss',
+          format: 'yyyy-MM-dd HH:mm',
           valueFormat: 'yyyy-MM-dd HH:mm:ss',
           index: 1,
           cell: true,

src/views/landTransportation/placeAnOrder/index.vue

@@ -327,7 +327,7 @@ export default {
             type: "date",
             searchRange: true,
             defaultTime:['00:00:00', '23:59:59'],
-            format: "yyyy-MM-dd HH:mm:ss",
+            format: "yyyy-MM-dd HH:mm",
             valueFormat: "yyyy-MM-dd HH:mm:ss",
             index: 15,
             width: 140,

src/views/wel/home/landTransportation/components/sales-trend.vue

@@ -313,7 +313,6 @@ export default {
         autoRotation: true,
         angle: -15
       });
-      return
       // 绘制轨迹
       let polyline = new AMap.Polyline({
         map: this.map,
@@ -327,7 +326,7 @@ export default {
 
       let passedPolyline = new AMap.Polyline({
         map: this.map,
-        // path: this.lineArr,
+        path: this.lineArr,
         strokeColor: "#AF5", //线颜色
         // strokeOpacity: 1,     //线透明度
         strokeWeight: 6 //线宽