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

src/api/fleet/driverMsg.js

@@ -34,7 +34,7 @@ export function preservation(data) {
 // 删除
 export function deleted(fId) {
   return request({
-    url: '/fleet/carManage/' + fId,
+    url: '/fleet/driverMsg/' + fId,
     method: 'delete'
   })
 }
@@ -47,4 +47,4 @@ export function driverList(data) {
     method: 'get',
     params: data
   })
-}
+}

src/views/basicdata/fleet/carManage-add-or-update.vue

@@ -73,6 +73,7 @@
           v-model="dataFormD.driverId"
           :disabled="doNot"
           placeholder="驾驶员"
+          @change="changeDriverId"
           style="width: 200px"
         >
           <el-option
@@ -728,6 +729,15 @@ export default {
     full() {
       this.dialogFull = !this.dialogFull;
     },
+    // 选择司机时
+    changeDriverId (val) {
+      for (let driver in this.driverMans) {
+        if (this.driverMans[driver].fId == val) {
+          this.dataFormD.driverTel = this.driverMans[driver].fTel
+          this.dataFormD.driverName = this.driverMans[driver].fName
+        }
+      }
+    },
     handleUpdata() {
       this.doNot = false;
     },
@@ -787,6 +797,8 @@ export default {
     init() {
       this.hide = true;
       this.visible = true;
+      this.changeCar();
+      this.handleSelect();
       if (this.dataForm.Id) {
         lookOver(this.dataForm.Id).then((data) => {
           this.doNot = true;
@@ -794,7 +806,8 @@ export default {
           if (data.data.fTmsorderbillsattachs) {
             this.fTmsorderbillsattachs = data.data.fTmsorderbillsattachs;
           }
-          this.optionsProjectTypeItem = data.data.fleetCompanyMsg;
+
+          // this.optionsProjectTypeItem = data.data.fleetCompanyMsg;
           // if (data.data.fleetCompanyMsg){
           //   this.handleSelect()
           // }

src/views/basicdata/fleet/driverMsg.vue

@@ -171,7 +171,7 @@
 </template>
 
 <script>
-import {listFtmsorderbills} from '@/api/fleet/driverMsg'
+import {listFtmsorderbills, deleted} from '@/api/fleet/driverMsg'
   import AddOrUpdate from './driverMsg-add-or-update'
   export default {
     data () {
@@ -287,11 +287,7 @@ import {listFtmsorderbills} from '@/api/fleet/driverMsg'
           cancelButtonText: '取消',
           type: 'warning'
         }).then(() => {
-          this.$http({
-            url: this.$http.adornUrl('/fleet/driverMsg/delete'),
-            method: 'post',
-            data: this.$http.adornData(driverMsgIds, false)
-          }).then(({data}) => {
+          deleted(driverMsgIds).then(data=> {
             if (data && data.code === 0) {
               this.$message({
                 message: '操作成功',
@@ -305,7 +301,7 @@ import {listFtmsorderbills} from '@/api/fleet/driverMsg'
               this.$message.error(data.msg)
             }
           })
-        }).catch(() => {})
+        })
       },
       formatSex: function (row, column) {
         return row.fFax == 0 ? '男' : row.fFax == 1 ? '女' : '未知'