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

src/views/landTransportation/dispatchingCars/index.vue

@@ -164,12 +164,12 @@ export default {
             format: "yyyy-MM-dd HH:mm",
             valueFormat: "yyyy-MM-dd HH:mm:ss",
             index: 1,
-            width: 150,
+            width: 134,
             search: true,
           }, {
             label: '业务员',
             index: 2,
-            width: 150,
+            width: 74,
             prop: 'salesman',
             search: true,
             overHidden: true,
@@ -184,12 +184,12 @@ export default {
             prop: 'dispatcherName',
             overHidden: true,
             index: 2,
-            width: 100,
+            width: 76,
           }, {
             label: '货运地点',
             prop: 'addressDetail',
             index: 3,
-            width: 140,
+            width: 122,
             search: true,
           }, {
             label: '提单号',
@@ -203,36 +203,36 @@ export default {
             prop: 'station',
             overHidden: true,
             index: 5,
-            width: 140,
+            width: 70,
             search: true,
           }, {
             label: '计划箱量',
             prop: 'ctnDetail',
             overHidden: true,
             index: 6,
-            width: 140
+            width: 84
           }, {
             label: '已派箱量',
             prop: 'dispatchCtnDetail',
             overHidden: true,
             index: 7,
-            width: 140
+            width: 84
           }, {
             label: '受理箱量',
             prop: 'sendCtnDetail',
             overHidden: true,
             index: 8,
-            width: 140
+            width: 94
           }, {
             label: '车队',
             index: 9,
-            width: 140,
+            width: 92,
             overHidden: true,
             prop: 'fleetNameDetail'
           }, {
             label: '运费',
             index: 10,
-            width: 140,
+            width: 98,
             prop: 'freight'
           }, {
             label: '状态',
@@ -245,14 +245,14 @@ export default {
             prop: 'corpShortName',
             overHidden: true,
             index: 12,
-            width: 140,
+            width: 112,
             search: true,
           }, {
             label: '订单号',
             prop: 'orderNo',
             index: 13,
             overHidden: true,
-            width: 160,
+            width: 100,
             search: true,
           }
           // , {
@@ -290,7 +290,7 @@ export default {
             format: "yyyy-MM-dd HH:mm",
             valueFormat: "yyyy-MM-dd HH:mm:ss",
             index: 15,
-            width: 140,
+            width: 128,
             search: true,
           }]
       },

src/views/landTransportation/driver/index.vue

@@ -262,24 +262,24 @@ export default {
           format: "yyyy-MM-dd HH:mm",
           valueFormat: "yyyy-MM-dd HH:mm:ss",
           index: 1,
-          width: 140,
+          width: 119,
           search: true,
         }, {
           label: '物流运输',
           prop: 'dispatchDeptName',
           overHidden: true,
           index: 1,
-          width: 140,
+          width: 82,
         }, {
           label: '运输调度',
           prop: 'dispatcherName',
           overHidden: true,
           index: 1,
-          width: 140,
+          width: 70,
         },{
           label: '货运地点',
           index: 2,
-          width: 160,
+          width: 138,
           search: true,
           prop: 'addressDetail'
         },{
@@ -294,11 +294,11 @@ export default {
           prop: 'station',
           overHidden: true,
           index: 4,
-          width: 140,
+          width: 68,
           search: true,
         },{
           label: '箱型',
-          width: 100,
+          width: 68,
           search: true,
           index: 5,
           overHidden: true,
@@ -311,19 +311,19 @@ export default {
           },
         }, {
           label: '箱量',
-          width: 50,
+          width: 58,
           index: 6,
           prop: 'ctnQuantity'
         },  {
           label: '车队',
-          width: 200,
+          width: 90,
           search: true,
           index:7,
           overHidden: true,
           prop: 'fleetId'
         },{
           label: '车号',
-          width: 150,
+          width: 82,
           prop: 'plateNo',
           filterable: true,
           overHidden: true,
@@ -337,7 +337,7 @@ export default {
           }
         }, {
           label: '司机',
-          width: 115,
+          width: 77,
           index:9,
           search: true,
           overHidden: true,
@@ -351,7 +351,7 @@ export default {
           },
         }, {
           label: '电话',
-          width: 160,
+          width: 124,
           index:10,
           overHidden: true,
           search: true,
@@ -366,7 +366,7 @@ export default {
         }, {
           label: '箱号',
           cell: true,
-          width: 245,
+          width: 140,
           index: 12,
           overHidden: true,
           search: true,
@@ -381,13 +381,13 @@ export default {
           format: "yyyy-MM-dd HH:mm:ss",
           valueFormat: "yyyy-MM-dd HH:mm:ss",
           index: 14,
-          width: 140
+          width: 132
         },{
           label: '受理日期',
           type: "datetime",
           format: 'yyyy-MM-dd HH:mm',
           valueFormat: 'yyyy-MM-dd HH:mm:ss',
-          width: 200,
+          width: 132,
           index: 13,
           prop: 'acceptTime'
         },{
@@ -395,7 +395,7 @@ export default {
           type: "datetime",
           format: 'yyyy-MM-dd HH:mm',
           valueFormat: 'yyyy-MM-dd HH:mm:ss',
-          width: 200,
+          width: 132,
           index: 13,
           prop: 'borrowTime'
         },{
@@ -408,18 +408,18 @@ export default {
           format: "yyyy-MM-dd HH:mm",
           valueFormat: "yyyy-MM-dd HH:mm:ss",
           index:16,
-          width: 140,
+          width: 132,
           // search: true,
         },{
           label: '货物名称',
           overHidden: true,
-          width: 160,
+          width: 100,
           search: true,
           index: 17,
           prop: 'goods'
         }, {
           label: '件数',
-          width: 100,
+          width: 75,
           search: true,
           index: 18,
           overHidden: true,
@@ -430,7 +430,7 @@ export default {
           precision:0
         }, {
           label: '重量(吨)',
-          width: 160,
+          width: 75,
           prop: 'landWeight',
           controls: false,
           overHidden: true,
@@ -439,7 +439,7 @@ export default {
           type: 'number'
         },{
           label: '尺码',
-          width: 100,
+          width: 75,
           // search: true,
           index:20,
           overHidden: true,
@@ -449,24 +449,25 @@ export default {
           label: '应付陆运费',
           overHidden: true,
           index: 21,
+          width: 68,
           prop: 'landAmountC'
         }, {
           label: '委托备注',
           overHidden: true,
-          width: 245,
+          width: 238,
           index: 22,
           prop: 'remarks'
         }, {
           label: '车队备注',
           overHidden: true,
-          width: 245,
+          width: 238,
           index: 23,
           prop: 'fleetRemarks'
         }, {
           label: '司机备注',
           overHidden: true,
           cell: true,
-          width: 245,
+          width: 238,
           index: 24,
           prop: 'driverRemarks'
         },
@@ -532,14 +533,14 @@ export default {
           format: "yyyy-MM-dd HH:mm",
           valueFormat: "yyyy-MM-dd HH:mm:ss",
           index: 31,
-          width: 140,
+          width: 100,
           search: true,
         },{
           label: '船名航次',
           prop: 'factory',
           overHidden: true,
           index: 32,
-          width: 140,
+          width: 120,
           search: true,
         },{
           label: '状态',

src/views/landTransportation/motorcadeDriver/index.vue

@@ -407,24 +407,24 @@ export default {
           format: "yyyy-MM-dd HH:mm",
           valueFormat: "yyyy-MM-dd HH:mm:ss",
           index: 1,
-          width: 145,
+          width: 119,
           search: true,
         }, {
           label: '物流运输',
           prop: 'dispatchDeptName',
           overHidden: true,
           index: 1,
-          width: 140,
+          width: 82,
         }, {
           label: '运输调度',
           prop: 'dispatcherName',
           overHidden: true,
           index: 1,
-          width: 140,
+          width: 70,
         }, {
           label: '货运地点',
           index: 2,
-          width: 160,
+          width: 138,
           search: true,
           prop: 'addressDetail'
         }, {
@@ -439,11 +439,11 @@ export default {
           prop: 'station',
           overHidden: true,
           index: 4,
-          width: 140,
+          width: 68,
           search: true,
         }, {
           label: '箱型',
-          width: 100,
+          width: 68,
           index: 5,
           search: true,
           overHidden: true,
@@ -456,7 +456,7 @@ export default {
           }
         }, {
           label: '箱量',
-          width: 50,
+          width: 58,
           index: 6,
           overHidden: true,
           prop: 'ctnQuantity'
@@ -483,7 +483,7 @@ export default {
             cell: true
           }, {
             label: '车号',
-            width: 150,
+            width: 82,
             cell: true,
             search: true,
             index: 8,
@@ -501,7 +501,7 @@ export default {
           },
           {
             label: '司机',
-            width: 115,
+            width: 77,
             search: true,
             overHidden: true,
             cell: true,
@@ -517,7 +517,7 @@ export default {
           }, {
             label: '电话',
             overHidden: true,
-            width: 160,
+            width: 124,
             search: true,
             cell: true,
             index: 10,
@@ -532,7 +532,7 @@ export default {
           },{
             label: '箱号',
             overHidden: true,
-            width: 245,
+            width: 140,
             index: 12,
             search: true,
             prop: 'ctnNo'
@@ -546,13 +546,13 @@ export default {
             format: "yyyy-MM-dd HH:mm",
             valueFormat: "yyyy-MM-dd HH:mm:ss",
             index: 14,
-            width: 140
+            width: 132
           },{
             label: '受理日期',
             type: "datetime",
             format: 'yyyy-MM-dd HH:mm',
             valueFormat: 'yyyy-MM-dd HH:mm:ss',
-            width: 200,
+            width: 132,
             index: 13,
             prop: 'acceptTime'
           },{
@@ -565,17 +565,17 @@ export default {
             format: "yyyy-MM-dd HH:mm",
             valueFormat: "yyyy-MM-dd HH:mm:ss",
             index:15,
-            width: 140,
+            width: 132,
           },{
             label: '货物名称',
             overHidden: true,
-            width: 160,
+            width: 100,
             search: true,
             index: 16,
             prop: 'goods'
           }, {
             label: '件数',
-            width: 100,
+            width: 75,
             search: true,
             index: 17,
             overHidden: true,
@@ -586,7 +586,7 @@ export default {
             precision:0
           }, {
             label: '重量(吨)',
-            width: 160,
+            width: 75,
             prop: 'landWeight',
             controls: false,
             overHidden: true,
@@ -611,7 +611,7 @@ export default {
           // },
           {
             label: '尺码',
-            width: 100,
+            width: 75,
             // search: true,
             index:19,
             overHidden: true,
@@ -627,26 +627,26 @@ export default {
             label: '应付陆运费',
             overHidden: true,
             index: 20,
-            width: 100,
+            width: 68,
             cell: true,
             prop: 'landAmountC'
           }, {
             label: '委托备注',
             overHidden: true,
             index: 21,
-            width: 245,
+            width: 238,
             prop: 'remarks'
           }, {
             label: '车队备注',
             cell: true,
             index: 22,
-            width: 245,
+            width: 238,
             overHidden: true,
             prop: 'fleetRemarks'
           }, {
             label: '司机备注',
             overHidden: true,
-            width: 245,
+            width: 238,
             index: 23,
             prop: 'driverRemarks'
           },
@@ -712,14 +712,14 @@ export default {
             format: "yyyy-MM-dd HH:mm",
             valueFormat: "yyyy-MM-dd HH:mm:ss",
             index: 30,
-            width: 145,
+            width: 100,
             search: true,
           }, {
             label: '船名航次',
             prop: 'factory',
             overHidden: true,
             index: 31,
-            width: 140,
+            width: 128,
             search: true,
           }
         ]

src/views/landTransportation/placeAnOrder/detailPage.vue

@@ -56,6 +56,7 @@
             v-if="goodsForm.status === 0 && typeTwo === false"
             size="small"
             style="margin-right: 80px;"
+            :loading="type"
             @click="submit(true)"
         >提交
         </el-button>

src/views/landTransportation/placeAnOrder/index.vue

@@ -232,12 +232,12 @@ export default {
             format: "yyyy-MM-dd HH:mm",
             valueFormat: "yyyy-MM-dd HH:mm:ss",
             index: 1,
-            width: 150,
+            width: 126,
             search: true,
           }, {
             label: '业务员',
             index: 2,
-            width: 150,
+            width: 76,
             prop: 'salesman',
             search: true,
             overHidden: true,
@@ -259,12 +259,12 @@ export default {
             },
             overHidden: true,
             index: 2,
-            width: 100
+            width: 94
           }, {
             label: '货运地点',
             prop: 'addressDetail',
             index: 3,
-            width: 140,
+            width: 132,
             search: true,
           }, {
             label: '提单号',
@@ -278,35 +278,35 @@ export default {
             prop: 'station',
             overHidden: true,
             index: 5,
-            width: 140,
+            width: 70,
             search: true,
           }, {
             label: '计划箱量',
             prop: 'ctnDetail',
             overHidden: true,
             index: 6,
-            width: 140
+            width: 78
           }, {
             label: '已派箱量',
             prop: 'dispatchCtnDetail',
             overHidden: true,
             index: 7,
-            width: 140
+            width: 82
           }, {
             label: '受理箱量',
             prop: 'sendCtnDetail',
             overHidden: true,
             index: 8,
-            width: 140
+            width: 80
           }, {
             label: '车队',
-            width: 150,
+            width: 78,
             index: 8,
             prop: 'fleetNameDetail'
           }, {
             label: '运费',
             index: 9,
-            width: 140,
+            width: 86,
             prop: 'freight'
           }, {
             label: '状态',
@@ -319,14 +319,14 @@ export default {
             prop: 'corpShortName',
             overHidden: true,
             index: 12,
-            width: 140,
+            width: 112,
             search: true,
           }, {
             label: '订单号',
             prop: 'orderNo',
             index: 13,
             overHidden: true,
-            width: 160,
+            width: 100,
             search: true,
           }
           // , {
@@ -357,7 +357,7 @@ export default {
             prop: 'createUserName',
             overHidden: true,
             index: 14,
-            width: 140,
+            width: 80,
           }, {
             label: '制单日期',
             overHidden: true,
@@ -368,7 +368,7 @@ export default {
             format: "yyyy-MM-dd HH:mm",
             valueFormat: "yyyy-MM-dd HH:mm:ss",
             index: 15,
-            width: 140,
+            width: 135,
             search: true,
           }]
       },