提交陆运

src/api/landTransportation/index.js

@@ -294,7 +294,7 @@ export function changeVehicle(data) {
 //查询车号
 export function queryVehicle(data) {
     return request({
-        url: '/api/blade-land/order-item/plate-no',
+        url: '/api/blade-land/order-fee/plate-no',
         method: 'get',
         params:data
     })

src/views/landTransportation/dispatchingCars/detailPage.vue

@@ -372,6 +372,9 @@
         <template slot="plateNoHeader" slot-scope="{column}">
           {{ column.label }}<span style="color:#F56C6C">*</span>
         </template>
+        <template slot="feeIdHeader" slot-scope="{column}">
+          {{ column.label }}<span style="color:#F56C6C">*</span>
+        </template>
         <template slot-scope="{row}" slot="feeId">
           <breakdown-select
               v-if="row.$cellEdit"
@@ -429,6 +432,12 @@
           ></crop-select>
           <span v-else>{{ row.corpName }}</span>
         </template>
+        <template slot="plateNoHeader" slot-scope="{column}">
+          {{ column.label }}<span style="color:#F56C6C">*</span>
+        </template>
+        <template slot="feeIdHeader" slot-scope="{column}">
+          {{ column.label }}<span style="color:#F56C6C">*</span>
+        </template>
         <template slot-scope="{row}" slot="feeId">
           <breakdown-select
               v-if="row.$cellEdit"
@@ -1390,6 +1399,9 @@ export default {
           props: {
             label: "fleetName",
             value: "fleetId"
+          },
+          change:(data)=>{
+            data.row.plateNo = ''
           }
         },
           //   {
@@ -1402,12 +1414,19 @@ export default {
             label: '车号',
             cell: true,
             prop: 'plateNo',
-            dicUrl: "/blade-land/order-fee/plate-no?orderId=" + this.id+'&fleetId={{key}}',
+            dicUrl: "api/blade-land/order-fee/plate-no?orderId=" + this.id + '&fleetId={{key}}',
             type: "select",
             props: {
               label: "label",
               value: "label"
             },
+            dicFormatter:(data)=>{
+              let list = []
+              data.data.forEach(ele=>{
+                list.push({label:ele})
+              })
+              return list
+            }
           }, {
             label: '费用名称',
             slot: true,
@@ -1511,17 +1530,24 @@ export default {
         // })
       })
     }
-    // queryVehicle({orderId: this.id}).then(res => {
-    //   const column = this.findObject(this.collectionOption.column, "plateNo");
+    queryVehicle({orderId: this.id}).then(res => {
+      const column = this.findObject(this.collectionOption.column, "plateNo");
+      column.dicData = []
+      res.data.data.forEach(item => {
+        column.dicData.push({label: item})
+      })
+      this.key++
+    });
+    // this.findObject(this.paymentOption.column, "plateNo").change = (data) => {
     //   const columnTwo = this.findObject(this.paymentOption.column, "plateNo");
-    //   column.dicData = []
     //   columnTwo.dicData = []
-    //   res.data.data.forEach(item => {
-    //     column.dicData.push({label: item})
-    //     columnTwo.dicData.push({label: item})
-    //   })
+    //   queryVehicle({orderId: this.id,fleetId:data.row.fleetId}).then(res => {
+    //     res.data.data.forEach(item => {
+    //       columnTwo.dicData.push({label: item})
+    //     })
+    //   });
     //   this.key++
-    // });
+    // }
     this.$refs.other.show = false
     // 非租户模式默认加载管理组数据
     if (!website.tenantMode) {
@@ -1807,11 +1833,15 @@ export default {
     rowCell(row, index) {
       if (row.$cellEdit) {
         if (row.plateNo) {
-          incidentalSubmit(row).then(res => {
-            this.$refs.collection.rowCell(row, index)
-            row = res.data.data
-            this.$message.success("保存成功");
-          })
+          if (row.feeId){
+            incidentalSubmit(row).then(res => {
+              this.$refs.collection.rowCell(row, index)
+              row = res.data.data
+              this.$message.success("保存成功");
+            })
+          }else {
+            this.$message.error("请选择费用名称");
+          }
         } else {
           this.$message.error("请选择车号");
         }
@@ -1821,12 +1851,21 @@ export default {
     },
     paymentRowCell(row, index) {
       if (row.$cellEdit) {
-        incidentalSubmit(row).then(res => {
-          row = res.data.data
-          this.$message.success("保存成功");
-        })
+        if (row.plateNo) {
+          if (row.feeId){
+            incidentalSubmit(row).then(res => {
+              row = res.data.data
+              this.$message.success("保存成功");
+            })
+          }else {
+            this.$message.error("请选择费用名称");
+          }
+        } else {
+          this.$message.error("请选择车号");
+        }
+      } else {
+        this.$refs.payment.rowCell(row, index)
       }
-      this.$refs.payment.rowCell(row, index)
     },
     //箱信息移除
     rowDel(row, index) {

src/views/landTransportation/motorcadeDriver/index.vue

@@ -240,6 +240,19 @@ export default {
             })
           }
         }, {
+          label: '状态',
+          overHidden: true,
+          width: 100,
+          type: 'select',
+          index: 14,
+          dicUrl: "/api/blade-system/dict-biz/dictionary?code=land_order_status",
+          props: {
+            label: "dictValue",
+            value: "dictKey"
+          },
+          dataType: "string",
+          prop: 'status'
+        }, {
           label: "司机",
           prop: "driverId",
           type: 'select',
@@ -665,19 +678,6 @@ export default {
             index: 31,
             width: 140,
             search: true,
-          }, {
-            label: '状态',
-            overHidden: true,
-            width: 100,
-            type: 'select',
-            index: 32,
-            dicUrl: "/api/blade-system/dict-biz/dictionary?code=land_order_status",
-            props: {
-              label: "dictValue",
-              value: "dictKey"
-            },
-            dataType: "string",
-            prop: 'status'
           }
         ]
       },

src/views/landTransportation/reportAnalysis/index.vue

@@ -51,6 +51,18 @@
             <div style="overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">{{ row.addressDetail }}</div>
           </el-tooltip>
         </template>
+        <template slot="extraAmountItemC" slot-scope="{ row,index}">
+          <el-tooltip class="item" effect="dark" placement="top">
+            <div v-html="ToBreak(row.extraAmountItemC)" slot="content"></div>
+            <div style="overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">{{ row.extraAmountItemC }}</div>
+          </el-tooltip>
+        </template>
+        <template slot="extraAmountItemD" slot-scope="{ row,index}">
+          <el-tooltip class="item" effect="dark" placement="top">
+            <div v-html="ToBreak(row.extraAmountItemD)" slot="content"></div>
+            <div style="overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">{{ row.extraAmountItemD }}</div>
+          </el-tooltip>
+        </template>
       </avue-crud>
       <el-dialog
           title="杂费明细"
@@ -384,6 +396,11 @@ export default {
             overHidden: true,
             index: 13,
             prop: 'remarks'
+          }, {
+            label: '应收杂费明细',
+            width: 100,
+            index: 17,
+            prop: 'extraAmountItemD'
           }]
       },
       totalData: {}
@@ -417,6 +434,11 @@ export default {
           index: 16,
           type: 'number',
           prop: 'profit'
+        }, {
+          label: '应付杂费明细',
+          width: 100,
+          index: 18,
+          prop: 'extraAmountItemC'
         })
       }else {
         return this.goodsOptionCrud.menu = false;
@@ -521,6 +543,11 @@ export default {
             index: 16,
             type: 'number',
             prop: 'profit'
+          }, {
+            label: '应付杂费明细',
+            width: 100,
+            index: 18,
+            prop: 'extraAmountItemC'
           })
         }else {
           return this.goodsOptionCrud.menu = false

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

@@ -57,6 +57,7 @@ export default {
     return {
       enclosure:false,
       data:[],
+      roleName: localStorage.getItem("roleName").split(','),
       option:{
         align:'center',
         dialogWidth:'85%',
@@ -87,12 +88,25 @@ export default {
           label: '保险日期',
           prop: 'insuranceExpired',
         }]
-      }
+      },
+      entrust:false,
+      dispatch:false,
     };
   },
   props: {
     sysType: Number
   },
+  mounted() {
+    if (this.roleName.indexOf('总经理') !== -1 || this.roleName.indexOf('部门经理') !== -1 || this.roleName.indexOf('业务员') !== -1){
+      // 委托、台账
+      this.entrust = true
+    }
+    if (this.roleName.indexOf('总调度') !== -1 || this.roleName.indexOf('分管调度') !== -1){
+      // 调度、台账、到期提醒
+      this.dispatch = true
+    }
+    if (this.roleName.indexOf('车队') !== -1){}
+  },
   methods: {
     inPage(type) {
       switch (type) {

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

@@ -37,7 +37,7 @@
               <span v-if="row.status == 3" style="color: #53C21D;">未完工</span>
               <span v-if="row.status == 5" style="color: #F56C6C;">未到厂</span>
               <span v-if="row.status == 4" style="color: #3C9CFF;">工单关闭</span>
-              <span v-if="row.status == 6" style="color: #3C9CFF;">已提箱</span>
+              <span v-if="row.status == 6" style="color: #3C9CFF;">未提箱</span>
             </template>
           </avue-crud>
         </div>
@@ -101,6 +101,7 @@ export default {
           {
             label:'货运日期',
             prop:'arrivalTime',
+            type: "date",
             format: "yyyy-MM-dd HH:mm",
             index:1,
             width:150,
@@ -221,7 +222,7 @@ export default {
             prop:'extraAmountC',
             index:12,
             width:100,
-            overHidden: true,
+            overHidden: true
           }
       )
     }
@@ -263,7 +264,7 @@ export default {
                 prop:'extraAmountC',
                 index:12,
                 width:100,
-                overHidden: true,
+                overHidden: true
               }
           )
         }