修改陆运

src/views/businessManagement/salesOrder/detailsPageEdit.vue

@@ -999,7 +999,7 @@ export default {
         lazy: true,
         treeLoad: (node, resolve)=> {
           const parentId = (node.level === 0) ? 0 : node.data.id;
-          const newTime = new Date().toLocaleString('chinese',{hour12:false})
+          const newTime = new Date().toLocaleString('chinese',{hour12:false}).replaceAll('/', '-')
           policyColumn({newTime: newTime,parentId: parentId,corps: this.form.corpId}).then(res => {
             resolve(res.data.data.map(item => {
               return {

src/views/landTransportation/dispatchingCars/detailPage.vue

@@ -1110,7 +1110,7 @@ export default {
         }, {
           // dispatchDept: "1123598813738675201"
           // dispatchDept: "1123598813738675201"
-          label: '调度公司',
+          label: '物流运输',
           prop: 'dispatchDept',
           cascader: ['dispatcher'],
           dicUrl: "/api/blade-system/dept/top-list?deptCategory=2",
@@ -1125,7 +1125,7 @@ export default {
             trigger: "blur"
           }]
         }, {
-          label: '调度员',
+          label: '运输调度',
           prop: 'dispatcher',
           type: "select",
           dicUrl: "/api/blade-user/userList?deptPid={{key}}",

src/views/landTransportation/motorcadeDriver/index.vue

@@ -679,13 +679,13 @@ export default {
             width: 140,
             search: true,
           }, {
-            label: '调度公司',
+            label: '物流运输',
             prop: 'dispatchDeptName',
             overHidden: true,
             index: 32,
             width: 140,
           }, {
-            label: '调度员',
+            label: '运输调度',
             prop: 'dispatcherName',
             overHidden: true,
             index: 33,

src/views/landTransportation/placeAnOrder/detailPage.vue

@@ -538,8 +538,9 @@ import website from "@/config/website";
 import {gaude, location} from "@/api/gaude";
 //地图回放
 import trackPlayback from "@/components/trackPlayback"
+
 export default {
-  comments:{
+  comments: {
     trackPlayback
   },
   props: {
@@ -552,8 +553,8 @@ export default {
   },
   data() {
     return {
-      dialogVisible:false,
-      lineArr:[],
+      dialogVisible: false,
+      lineArr: [],
       activeIndex: '1',
       KeyBox: 0,
       KeyBoxTwo: 0,
@@ -1007,7 +1008,7 @@ export default {
             trigger: "blur"
           }]
         }, {
-          label: '调度公司',
+          label: '物流运输',
           prop: 'dispatchDept',
           dicUrl: "/api/blade-system/dept/top-list?deptCategory=2",
           cascader: ['dispatcher'],
@@ -1022,7 +1023,7 @@ export default {
             trigger: "blur"
           }]
         }, {
-          label: '调度员',
+          label: '运输调度',
           prop: 'dispatcher',
           type: "select",
           dicUrl: "/api/blade-user/userList?deptPid={{key}}",
@@ -1520,7 +1521,7 @@ export default {
           // })
           //查询业务员
           this.salesmanQuery()
-          if (this.roleName.indexOf('平台') !== -1||this.roleName.indexOf('经理') !== -1||this.roleName.indexOf('部门经理') !== -1||this.roleName.indexOf('总经理') !== -1){
+          if (this.roleName.indexOf('平台') !== -1 || this.roleName.indexOf('经理') !== -1 || this.roleName.indexOf('部门经理') !== -1 || this.roleName.indexOf('总经理') !== -1) {
             this.goodsForm.status = 2
           }
         })
@@ -1533,10 +1534,11 @@ export default {
           businessType: "出口",
           shippingMode: "集装箱",
           status: 0,
+          salesman:JSON.parse(localStorage.getItem("saber-userInfo")).content.user_id,
           belongCompany: res.data.data ? res.data.data.belongCompany : '',
           bsDate: new Date((new Date).getTime() + 8 * 60 * 60 * 1000).toJSON().split('T').join(' ').substr(0, 19)//获取当天时间并格式化
         }
-        this.salesmanQuery()
+        this.salesmanQuery('',true)
       })
       this.entrustList = []
     }
@@ -1549,14 +1551,14 @@ export default {
     this.$refs.other.show = false
   },
   methods: {
-    openTrack(row){
-      gaude({itemId: row.id,plateNo:row.plateNo,tenantId:'234557',color:'2'}).then(res => {
+    openTrack(row) {
+      gaude({itemId: row.id, plateNo: row.plateNo, tenantId: '234557', color: '2'}).then(res => {
         this.lineArr = res.data.data.trackArray
         this.dialogVisible = true
-        let this_=this
-        setTimeout(function(){
+        let this_ = this
+        setTimeout(function () {
           this_.$refs.playback.initMap();
-        },100)
+        }, 100)
       })
       // location({itemId: row.id,plateNo:'陕YH0008'}).then(res => {
       //   // console.log(res.data.data)
@@ -1577,9 +1579,12 @@ export default {
       });
     },
     //查询业务员
-    salesmanQuery(realName) {
-      getSalesman({realName: realName}).then(res => {
+    salesmanQuery(realName,type) {
+      getSalesman({realName: realName, userExt: this.goodsForm.corpId}).then(res => {
         this.salesmanList = res.data.data
+        if (type){
+          this.changeSelect(this.goodsForm.salesman)
+        }
       })
     },
     //自定义列保存
@@ -1751,13 +1756,13 @@ export default {
     },
     //返回主列表
     backToList(value) {
-      if (value === 0){
+      if (value === 0) {
         this.goodsForm = {}
         this.$emit('backToList')
-      }else if(value === 1){
+      } else if (value === 1) {
         this.goodsForm = {}
-        this.$emit('backToList',true)
-      }else if (value === 2){
+        this.$emit('backToList', true)
+      } else if (value === 2) {
         this.$router.push({
           path: '/wel/index'
         });
@@ -1765,11 +1770,11 @@ export default {
     },
     //删除途径地址
     deleteAddress(scope) {
-      if (scope.row.id){
-        tRemove({ids:scope.row.id}).then(res=>{
+      if (scope.row.id) {
+        tRemove({ids: scope.row.id}).then(res => {
           this.tableData.splice(scope.$index, 1);
         })
-      }else {
+      } else {
         this.tableData.splice(scope.$index, 1);
       }
     },
@@ -1875,7 +1880,7 @@ export default {
                 orderAddressList: data,
                 fileList: this.orderFilesList,
                 itemList: this.entrustList,
-                orderItemList:[],
+                orderItemList: [],
                 orderFeeList: this.collectionList.concat(this.paymentList)
               }).then(res => {
                 this.$message.success('保存成功');
@@ -1966,8 +1971,7 @@ export default {
           this.refreshData()
         })
       }
-    }
-    ,
+    },
     //收费新增
     addRowCollection() {
       this.$refs.collection.rowCellAdd({
@@ -1975,16 +1979,14 @@ export default {
         type: '1',
         $cellEdit: true
       });
-    }
-    ,
+    },
     //打开附件
     annexOpen(row, index) {
       this.enclosure = true
       getFee({id: row.id}).then(res => {
         this.orderList = res.data.data
       })
-    }
-    ,
+    },
     //付费新增
     addRowPayment() {
       this.$refs.payment.rowCellAdd({
@@ -1992,18 +1994,15 @@ export default {
         type: '2',
         $cellEdit: true
       });
-    }
-    ,
+    },
     //选择费用
     selectValue(value, row) {
       this.$set(row, 'feeName', value.cname)
-    }
-    ,
+    },
     //选择客户信息触发
     getfleetId(data, row) {
       this.$set(row, 'corpName', data.cname)
-    }
-    ,
+    },
     //收款信息移除
     makeDel(row, index) {
       this.$confirm('此操作将永久删除该单据, 是否继续?', '提示', {
@@ -2019,8 +2018,7 @@ export default {
           message: '已取消删除'
         });
       });
-    }
-    ,
+    },
     //付款信息移除
     feeDel(row, index) {
       this.$confirm('此操作将永久删除该单据, 是否继续?', '提示', {
@@ -2036,16 +2034,14 @@ export default {
           message: '已取消删除'
         });
       });
-    }
-    ,
+    },
     //选择公司名称带出所属公司
     getCorpData(row) {
       this.goodsForm.belongCompany = row.belongCompany
       this.goodsForm.salesman = ''
       //查询业务员
       this.salesmanQuery()
-    }
-    ,
+    },
     //选择地址客户带出地址
     withAddress(row, scope) {
       this.$set(this.tableData[scope.$index], 'contacts', row.attn)
@@ -2063,8 +2059,7 @@ export default {
           scope.row.key++
         })
       }
-    }
-    ,
+    },
     //自定义表头
     renderHeader(h) {
       return (
@@ -2075,8 +2070,7 @@ export default {
             </el-tooltip>
           </div>
       )
-    }
-    ,
+    },
     //自定义表头
     customTitle(h, {column, $index}) {
       let text = column.label

src/views/landTransportation/reportAnalysis/index.vue

@@ -332,11 +332,6 @@ export default {
           width: 150,
           search: true,
         }, {
-          label: '分管员',
-          prop: 'salesmanName',
-          index: 3,
-          width: 140,
-        }, {
           label: '货运地点',
           index: 4,
           width: 160,
@@ -419,13 +414,13 @@ export default {
         if (item.prop === 'dispatchDeptName') return false
       }
       return this.goodsOptionCrud.column.push({
-        label: '调度公司',
+        label: '物流运输',
         prop: 'dispatchDeptName',
         overHidden: true,
         index: 1,
         width: 140
       }, {
-        label: '调度员',
+        label: '运输调度',
         prop: 'dispatcherName',
         overHidden: true,
         index: 1,
@@ -487,6 +482,11 @@ export default {
         index: 11,
         prop: 'landAmountD'
       }, {
+        label: '业务员',
+        prop: 'salesmanName',
+        index: 3,
+        width: 140,
+      }, {
         label: '应收杂费',
         overHidden: true,
         index: 12,
@@ -516,6 +516,11 @@ export default {
         index: 14,
         prop: 'landAmountC'
       }, {
+        label: '业务员',
+        prop: 'salesmanName',
+        index: 3,
+        width: 140,
+      }, {
         label: '应付杂费',
         overHidden: true,
         index: 15,
@@ -642,13 +647,13 @@ export default {
           if (item.prop === 'dispatchDeptName') return false
         }
         return this.goodsOptionCrud.column.push({
-          label: '调度公司',
+          label: '物流运输',
           prop: 'dispatchDeptName',
           overHidden: true,
           index: 1,
           width: 140
         }, {
-          label: '调度员',
+          label: '运输调度',
           prop: 'dispatcherName',
           overHidden: true,
           index: 1,

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

@@ -177,11 +177,22 @@ export default {
             index: 14,
             width: 100,
             overHidden: true,
-          },
-          {
+          },{
+            label: '物流运输',
+            prop: 'dispatchDeptName',
+            overHidden: true,
+            index: 15,
+            width: 100
+          }, {
+            label: '运输调度',
+            prop: 'dispatcherName',
+            overHidden: true,
+            index: 16,
+            width: 100,
+          }, {
             label: '备注',
             prop: 'remarks',
-            index: 15,
+            index: 17,
             width: 100,
             overHidden: true,
           },