caojunjie hace 3 años
padre
commit
79c91a3168

+ 1 - 1
src/views/landTransportation/dispatchingCars/detailPage.vue

@@ -333,7 +333,7 @@ export default {
           }, {
             label: '司机',
             width: 115,
-            prop: 'driverId'
+            prop: 'driverName'
           }, {
             label: '电话',
             width: 160,

+ 12 - 0
src/views/landTransportation/driver/index.vue

@@ -100,6 +100,7 @@ export default {
           label: '状态',
           width: 200,
           type: 'select',
+          overHidden: true,
           dicUrl: "/api/blade-system/dict-biz/dictionary?code=land_order_status",
           props: {
             label: "dictValue",
@@ -111,6 +112,7 @@ export default {
           label: '车队',
           width: 200,
           search: true,
+          overHidden: true,
           type: 'select',
           cascader: ['plateNo'],
           dicUrl: "/api/blade-client/corpsdesc/fleet-list",
@@ -123,6 +125,7 @@ export default {
           label: '尺寸箱型',
           width: 100,
           search: true,
+          overHidden: true,
           prop: 'ctnType'
         }, {
           label: '箱量',
@@ -133,12 +136,14 @@ export default {
           width: 160,
           prop: 'landWeight',
           controls: false,
+          overHidden: true,
           precision: 6,
           type: 'number'
         }, {
           label: '车号',
           width: 150,
           prop: 'vehicleId',
+          overHidden: true,
           type: 'select',
           dicUrl: "/api/blade-client/land-vehicle/vehicle-list?fleetId={{key}}",
           props: {
@@ -149,26 +154,33 @@ export default {
           label: '司机',
           width: 115,
           search: true,
+          overHidden: true,
           prop: 'driverName'
         }, {
           label: '电话',
           width: 160,
+          overHidden: true,
           prop: 'tel'
         }, {
           label: '箱号',
           cell: true,
+          overHidden: true,
           prop: 'ctnNo'
         }, {
           label: '陆运费(C)',
+          overHidden: true,
           prop: 'landAmountC'
         }, {
           label: '委托备注',
+          overHidden: true,
           prop: 'remarks'
         }, {
           label: '车队备注',
+          overHidden: true,
           prop: 'fleetRemarks'
         }, {
           label: '司机备注',
+          overHidden: true,
           cell: true,
           prop: 'driverRemarks'
         }

+ 13 - 0
src/views/landTransportation/motorcadeDriver/index.vue

@@ -95,6 +95,7 @@ export default {
           }],
         column: [{
           label: '状态',
+          overHidden: true,
           width: 200,
           type: 'select',
           dicUrl: "/api/blade-system/dict-biz/dictionary?code=land_order_status",
@@ -110,6 +111,7 @@ export default {
           search: true,
           type: 'select',
           cascader: ['plateNo'],
+          overHidden: true,
           dicUrl: "/api/blade-client/corpsdesc/fleet-list",
           props: {
             label: "cname",
@@ -120,16 +122,19 @@ export default {
           label: '尺寸箱型',
           width: 100,
           search: true,
+          overHidden: true,
           prop: 'ctnType'
         }, {
           label: '箱量',
           width: 50,
+          overHidden: true,
           prop: 'ctnQuantity'
         }, {
           label: '重量',
           width: 160,
           prop: 'landWeight',
           controls: false,
+          overHidden: true,
           precision: 6,
           type: 'number'
         }, {
@@ -137,6 +142,7 @@ export default {
           width: 150,
           cell: true,
           prop: 'vehicleId',
+          overHidden: true,
           type: 'select',
           dicUrl: "/api/blade-client/land-vehicle/vehicle-list?fleetId={{key}}",
           props: {
@@ -160,27 +166,34 @@ export default {
           width: 115,
           search: true,
           // prop: 'driverId'
+          overHidden: true,
           prop: 'driverName'
         }, {
           label: '电话',
+          overHidden: true,
           width: 160,
           prop: 'tel'
         }, {
           label: '陆运费(D)',
+          overHidden: true,
           prop: 'landAmountD'
         }, {
           label: '陆运费(C)',
+          overHidden: true,
           cell: true,
           prop: 'landAmountC'
         }, {
           label: '委托备注',
+          overHidden: true,
           prop: 'remarks'
         }, {
           label: '车队备注',
           cell: true,
+          overHidden: true,
           prop: 'fleetRemarks'
         }, {
           label: '司机备注',
+          overHidden: true,
           prop: 'driverRemarks'
         }
         ]

+ 7 - 1
src/views/landTransportation/placeAnOrder/detailPage.vue

@@ -135,6 +135,8 @@
           <crop-select
               :disabled="goodsForm.status === 1"
               v-model="goodsForm.corpId"
+              @getCorpData="getCorpData"
+
           ></crop-select>
         </template>
       </avue-form>
@@ -374,7 +376,7 @@ export default {
           valueFormat: 'yyyy-MM-dd HH:mm:ss',
           prop: 'arrivalTime'
         }, {
-          label: '工厂名称',
+          label: '船名航次',
           prop: 'factory'
         }, {
           label: '货物名称',
@@ -796,6 +798,10 @@ export default {
         });
       });
     },
+    //选择客户名称带出所属公司
+    getCorpData(row) {
+      this.goodsForm.belongCompany = row.belongCompany
+    },
     //自定义表头
     renderHeader(h) {
       return (