Merge branch 'master' of git.echepei.com:zhujiawei/Warehouse_management_ui into master

src/views/track/cabinet/index.vue

@@ -470,7 +470,7 @@ export default {
         {
           surface: "7",
           label: "mblno",
-          name: "运单号",
+          name: "提单号",
           checked: 0,
           width: 100,
           fixed: "left",
@@ -552,6 +552,20 @@ export default {
           checked: 0,
           width: 100,
         },
+        {
+          surface: "19",
+          label: "orderNo",
+          name: "运单号",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "20",
+          label: "driverTel",
+          name: "司机电话",
+          checked: 0,
+          width: 100,
+        },
       ],
       getRowList: [
         {
@@ -599,7 +613,7 @@ export default {
         {
           surface: "7",
           label: "mblno",
-          name: "运单号",
+          name: "提单号",
           checked: 0,
           width: 100,
           fixed: "left",
@@ -681,6 +695,20 @@ export default {
           checked: 0,
           width: 100,
         },
+        {
+          surface: "19",
+          label: "orderNo",
+          name: "运单号",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "20",
+          label: "driverTel",
+          name: "司机电话",
+          checked: 0,
+          width: 100,
+        },
       ],
       allCheck: false,
       title: "",

src/views/track/goods/index.vue

@@ -71,7 +71,7 @@
             </el-select>
           </el-form-item>
         </el-col>
-        
+
       </el-row>
       <el-collapse-transition>
         <div v-show="show">
@@ -467,10 +467,10 @@ export default {
         {
           surface: "7",
           label: "mblno",
-          name: "运单号",
+          name: "提单号",
           checked: 0,
           width: 100,
-           fixed: "left",
+          fixed: "left",
         },
         {
           surface: "8",
@@ -549,6 +549,20 @@ export default {
           checked: 0,
           width: 100,
         },
+        {
+          surface: "19",
+          label: "orderNo",
+          name: "运单号",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "20",
+          label: "driverTel",
+          name: "司机电话",
+          checked: 0,
+          width: 100,
+        },
       ],
       getRowList: [
         {
@@ -596,10 +610,10 @@ export default {
         {
           surface: "7",
           label: "mblno",
-          name: "运单号",
+          name: "提单号",
           checked: 0,
           width: 100,
-           fixed: "left",
+          fixed: "left",
         },
         {
           surface: "8",
@@ -678,6 +692,20 @@ export default {
           checked: 0,
           width: 100,
         },
+        {
+          surface: "19",
+          label: "orderNo",
+          name: "运单号",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "20",
+          label: "driverTel",
+          name: "司机电话",
+          checked: 0,
+          width: 100,
+        },
       ],
       allCheck: false,
       title: "",

src/views/track/meetSingle/index.vue

@@ -557,6 +557,13 @@ export default {
           checked: 0,
           width: 100,
         },
+        {
+          surface: "20",
+          label: "driverTel",
+          name: "司机电话",
+          checked: 0,
+          width: 100,
+        },
       ],
       getRowList: [
         {
@@ -693,6 +700,13 @@ export default {
           checked: 0,
           width: 100,
         },
+        {
+          surface: "20",
+          label: "driverTel",
+          name: "司机电话",
+          checked: 0,
+          width: 100,
+        },
       ],
       allCheck: false,
       title: "",

src/views/track/receipt/index.vue

@@ -470,10 +470,10 @@ export default {
         {
           surface: "7",
           label: "mblno",
-          name: "运单号",
+          name: "提单号",
           checked: 0,
           width: 100,
-           fixed: "left",
+          fixed: "left",
         },
         {
           surface: "8",
@@ -552,6 +552,20 @@ export default {
           checked: 0,
           width: 100,
         },
+        {
+          surface: "19",
+          label: "orderNo",
+          name: "运单号",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "20",
+          label: "driverTel",
+          name: "司机电话",
+          checked: 0,
+          width: 100,
+        },
       ],
       getRowList: [
         {
@@ -599,10 +613,10 @@ export default {
         {
           surface: "7",
           label: "mblno",
-          name: "运单号",
+          name: "提单号",
           checked: 0,
           width: 100,
-           fixed: "left",
+          fixed: "left",
         },
         {
           surface: "8",
@@ -681,6 +695,20 @@ export default {
           checked: 0,
           width: 100,
         },
+        {
+          surface: "19",
+          label: "orderNo",
+          name: "运单号",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "20",
+          label: "driverTel",
+          name: "司机电话",
+          checked: 0,
+          width: 100,
+        },
       ],
       allCheck: false,
       title: "",

src/views/track/singleCost/index.vue

@@ -421,7 +421,7 @@ export default {
         {
           surface: "7",
           label: "mblno",
-          name: "运单号",
+          name: "提单号",
           checked: 0,
           width: 100,
           fixed: "left",
@@ -503,6 +503,20 @@ export default {
           checked: 0,
           width: 100,
         },
+        {
+          surface: "19",
+          label: "orderNo",
+          name: "运单号",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "20",
+          label: "driverTel",
+          name: "司机电话",
+          checked: 0,
+          width: 100,
+        },
       ],
       getRowList: [
         {
@@ -550,7 +564,7 @@ export default {
         {
           surface: "7",
           label: "mblno",
-          name: "运单号",
+          name: "提单号",
           checked: 0,
           width: 100,
           fixed: "left",
@@ -632,6 +646,20 @@ export default {
           checked: 0,
           width: 100,
         },
+        {
+          surface: "19",
+          label: "orderNo",
+          name: "运单号",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "20",
+          label: "driverTel",
+          name: "司机电话",
+          checked: 0,
+          width: 100,
+        },
       ],
       allCheck: false,
       title: "",

src/views/track/suitcase/index.vue

@@ -470,10 +470,10 @@ export default {
         {
           surface: "7",
           label: "mblno",
-          name: "运单号",
+          name: "提单号",
           checked: 0,
           width: 100,
-           fixed: "left",
+          fixed: "left",
         },
         {
           surface: "8",
@@ -552,6 +552,20 @@ export default {
           checked: 0,
           width: 100,
         },
+        {
+          surface: "19",
+          label: "orderNo",
+          name: "运单号",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "20",
+          label: "driverTel",
+          name: "司机电话",
+          checked: 0,
+          width: 100,
+        },
       ],
       getRowList: [
         {
@@ -599,10 +613,10 @@ export default {
         {
           surface: "7",
           label: "mblno",
-          name: "运单号",
+          name: "提单号",
           checked: 0,
           width: 100,
-           fixed: "left",
+          fixed: "left",
         },
         {
           surface: "8",
@@ -681,6 +695,20 @@ export default {
           checked: 0,
           width: 100,
         },
+        {
+          surface: "19",
+          label: "orderNo",
+          name: "运单号",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "20",
+          label: "driverTel",
+          name: "司机电话",
+          checked: 0,
+          width: 100,
+        },
       ],
       allCheck: false,
       title: "",