车辆排班

src/api/vehicle/vehicleSchedulManage.js

@@ -85,3 +85,15 @@ export function orderStatistics(type) {
     method: 'get',
   });
 }
+
+
+/**
+ * 
+ * 获取保养类型
+ */
+export function getUpkeepAll() {
+  return fetch({
+    url: '/vehicle/upkeep/item/all',
+    method: 'get',
+  });
+}
\ No newline at end of file

src/views/index/vehicleMaintenanceModal.vue

@@ -24,7 +24,7 @@
         <span>保养</span>
       </el-form-item>
       <el-form-item label="保养项目:">
-        <span></span>
+        <span>{{upkeepStr}}</span>
       </el-form-item>
     </el-form>
     <!-- <div slot="footer" class="dialog-footer" v-if="currentItem.ii.vehicleBookRecord.status==2">
@@ -44,7 +44,8 @@
   import {
     agreeBook,
     cancleBook,
-    rejectBook
+    rejectBook,
+    getUpkeepAll
   } from 'api/vehicle/vehicleSchedulManage';
   export default {
     components: {
@@ -56,9 +57,23 @@
     data() {
       return {
         baoyang:false,
+        upkeepStr:''
       }
     },
     created() {
+      getUpkeepAll().then(response => {
+        var arr = this.currentItem.ii.vehicleBookRecord.upkeepIds.split(",");
+        var str = '';
+        arr.forEach(function(item){
+          response.data.forEach(function(itm){
+            if(itm.id==item){
+              str += itm.name + '、';
+              return;
+            }
+          })
+        })
+        this.upkeepStr = str.substring(0,str.length-1);
+      })
       console.log(this.currentItem);
     },
     watch: {

src/views/vehicle/vehicleSchedulManage/vehicleMaintenanceModal.vue

@@ -24,7 +24,7 @@
         <span>保养</span>
       </el-form-item>
       <el-form-item label="保养项目:">
-        <span></span>
+        <span>{{upkeepStr}}</span>
       </el-form-item>
     </el-form>
     <div slot="footer" class="dialog-footer" v-if="currentItem.ii.vehicleBookRecord.status==2">
@@ -44,7 +44,8 @@
   import {
     agreeBook,
     cancleBook,
-    rejectBook
+    rejectBook,
+    getUpkeepAll
   } from 'api/vehicle/vehicleSchedulManage';
   export default {
     components: {
@@ -56,9 +57,23 @@
     data() {
       return {
         baoyang:false,
+        upkeepStr:''
       }
     },
     created() {
+      getUpkeepAll().then(response => {
+        var arr = this.currentItem.ii.vehicleBookRecord.upkeepIds.split(",");
+        var str = '';
+        arr.forEach(function(item){
+          response.data.forEach(function(itm){
+            if(itm.id==item){
+              str += itm.name + '、';
+              return;
+            }
+          })
+        })
+        this.upkeepStr = str.substring(0,str.length-1);
+      })
       console.log(this.currentItem);
     },
     watch: {

src/views/vehicle/vehicleSchedulManage/vehiclePlanModal.vue

@@ -57,6 +57,11 @@
                      <!--:value="item.code"></el-option>-->
         </el-select>
       </el-form-item>
+      <el-form-item label="保养类型" prop="upkeepIds" v-if="form.bookType==6">
+        <el-checkbox-group v-model="form.upkeepIds">
+          <el-checkbox v-for="item in upkeepList" :label="item.id" :key="item.id">{{item.name}}</el-checkbox>
+        </el-checkbox-group>
+      </el-form-item>
       <el-form-item label="使用人" prop="vehicleUsername">
         <el-input v-model="form.vehicleUsername" placeholder="请输入使用人"></el-input>
       </el-form-item>
@@ -99,7 +104,8 @@
     getAll
   } from 'api/base_info/branch_company/';
   import {
-    bookPlan
+    bookPlan,
+    getUpkeepAll
   } from 'api/vehicle/vehicleSchedulManage';
   import ElRow from "element-ui/packages/row/src/row";
   import ElCol from "element-ui/packages/col/src/col";
@@ -123,6 +129,7 @@
         },
         anpai:false,
         allCompaniesArr:[],
+        upkeepList:[],
         form:{
           remark: "",
           vehicleUsername: "",
@@ -131,6 +138,7 @@
           vehicleUserPhone:"",//使用人联系电话
           bookType: undefined,//用途
           times: [],
+          upkeepIds:[]
         },
         rules: {
           vehicleUsername: [
@@ -181,6 +189,9 @@
       getAllCompany(codeAndBranchCompany => {
         this.allCompanies = codeAndBranchCompany;
       });
+      getUpkeepAll().then(response => {
+        this.upkeepList = response.data
+      })
     },
     watch: {
       anpai(newValue, oldValue){
@@ -231,6 +242,17 @@
         console.log(this.form.times);
         set[formName].validate(valid => {
           if (valid) {
+            if(this.form.bookType==6){
+              if(this.form.upkeepIds.length==0){
+                this.$notify({
+                  title: '警告',
+                  message: '请选择保养类型',
+                  type: 'warning',
+                  duration: 2000
+                });
+                return false;
+              }
+            }
             let params = {
               vehicleId:this.currentItem.item.id,
               bookStartDate: formatDate(this.form.times[0], "yyyy-MM-dd hh")+":00:00",//预定开始时间
@@ -239,7 +261,8 @@
               bookType: this.form.bookType,//预定车辆用途类型
               vehicleUsername: this.form.vehicleUsername,//使用人姓名
               vehicleUserPhone: this.form.vehicleUserPhone,//使用人电话
-              remark: this.form.remark//说明
+              remark: this.form.remark,//说明
+              upkeepIds:this.form.bookType==6?this.form.upkeepIds.join(","):'',//保养类型
             };
             bookPlan(params).then(response => {
               if (response.status === 200) {