Merge remote-tracking branch 'remotes/origin/master' into base-modify

车辆信息管理删除

src/api/vehicle/vehicleInfo/index.js

@@ -24,6 +24,16 @@ export function addObj(obj) {
   });
 }
 
+/*
+* 删除一条车辆数据
+* */
+export function delObj(id) {
+  return fetch({
+    url: '/vehicle/vehicleInfo/del/' + id,
+    method: 'delete'
+  });
+}
+
 export function book(param) {
   return fetch({
     url: '/vehicle/vehicleInfo/book/4employee',

src/views/vehicle/vehicleInfo/index.vue

@@ -328,6 +328,19 @@
           </el-button>
           <el-button size="small" type="success" @click="handleBookInfo(scope.row)">预订信息</el-button>
           <el-button size="small" type="success" @click="handleDepartureLog(scope.row)">出车记录</el-button>
+          <el-popover
+            ref="popover5"
+            placement="top"
+            width="160"
+            v-model="scope.row.visible2">
+            <p>确定删除吗？</p>
+            <div style="text-align: right; margin: 0">
+              <el-button size="mini" type="text" @click="scope.row.visible2 = false">取消</el-button>
+              <el-button type="primary" size="mini" @click="deleteHandler(scope.row)">确定</el-button>
+            </div>
+          </el-popover>
+          <el-button type="danger" size="small" v-popover:popover5>删除</el-button>
+
         </template>
       </el-table-column>
 
@@ -1757,6 +1770,9 @@
           if (!this.$utils.isEmpty(response.data.data) && this.$utils.isInteger(response.data.totalCount)) {
             listRs = response.data.data;
             totalCountRs = response.data.totalCount;
+            listRs.map(function(item){
+              item.visible2 = false;
+            });
           }
           this.listLoading = false;
           this.list = listRs;
@@ -1984,6 +2000,30 @@
           }
         });
       },
+      /**
+       * 删除
+       * */
+      deleteHandler(row) {
+        delObj(row.id).then(response => {
+          if (response.status === 200) {
+            this.$notify({
+              title: '成功',
+              message: '删除成功',
+              type: 'success',
+              duration: 2000
+            });
+            this.bannerDialogVisible = false;
+            this.getList();
+          } else {
+            this.$notify({
+              title: '删除失败',
+              message: rsCode.msg[response.code] ? rsCode.msg[response.code] : '操作失败！',
+              type: 'error',
+              duration: 2000
+            });
+          }
+        });
+      },
       resetTemp() {
         this.form = {
           status: undefined,