bug1376

src/App.vue

@@ -63,6 +63,20 @@
     align-items: center;
   }
 
+
+  .flex-fdc-aic-jcc{
+    display: flex;
+    justify-content: center;
+    flex-direction: column;
+    align-items: center;
+  }
+
+
+  .flex-aic{
+    display: flex;
+    align-items: center;
+  }
+
   .flex-jcc-aic-cl{
     display: flex;
     align-items: center;

src/views/vehicle/festivalModal.vue

 <template>
-  <el-dialog title="节假日" :visible.sync="oneDialogVisible" @close="closePop" :modal="false" width="30%">
+  <el-dialog title="节假日" :visible.sync="oneDialogVisible" @close="closePop" :modal="false" width="40%">
     <el-form ref="form" :model="form" :rules="rules" label-width="140px">
       <el-form-item label="节日名称" prop="festivalDay">
         <el-input v-model="form.festivalDay" placeholder="请输入节日名称"></el-input>
@@ -180,6 +180,7 @@
                 })
                 this.$emit('festivalModalEvent', true);
               } else {
+                this.isClick = false
                 this.$notify({
                   title: '失败',
                   message: response.message,

src/views/vehicle/festivalPriceSetting.vue

 <template>
-  <el-dialog title="节假日价格设置" :visible.sync="oneDialogVisible" @close="closePop" :modal="false" >
+  <el-dialog title="节假日价格设置" :visible.sync="oneDialogVisible" @close="closePop" :modal="false" width="66%">
     <div style="min-height: 500px">
       <div class="filter-container flex-aic-jce" ref="filter-container">
         <el-button class="filter-item" @click="handleCreate" plain><i class="el-icon-plus"></i>添加节假日</el-button>

src/views/vehicle/generalPriceSetting.vue

 <template>
-  <el-dialog title="通用价格设置" :visible.sync="oneDialogVisible" @close="closePop" :modal="false" width="30%">
+  <el-dialog title="通用价格设置" :visible.sync="oneDialogVisible" @close="closePop" :modal="false" width="66%">
     <el-form ref="form" :model="form" :rules="rules" label-width="140px">
       <el-form-item label="租赁价格" prop="rentPrice">
         <el-input type="number" v-model="form.rentPrice" placeholder="输入租赁价格"></el-input>
@@ -163,6 +163,7 @@
                 })
                 this.$emit('generalDialogEvent', true);
               } else {
+                this.isClick = false
                 this.$notify({
                   title: '失败',
                   message: response.message,

src/views/vehicle/vehicleInfo/index.vue

@@ -66,8 +66,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="出行状态">
-              <el-select class="filter-item" v-model="listQuery.status" placeholder="请选择出行状态" filterable>
+            <el-form-item label="车辆状态">
+              <el-select class="filter-item" v-model="listQuery.status" placeholder="请选择车辆状态" filterable>
                 <el-option :key="undefined" label="全部" :value="undefined"></el-option>
                 <el-option
                   v-for="(val,index) in getAllVehicleStatus()"
@@ -78,6 +78,16 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="6">
+            <el-form-item label="用途">
+              <el-select class="filter-item" v-model="listQuery.useType" placeholder="请选择用途" filterable>
+                <el-option :key="undefined" label="全部" :value="undefined"></el-option>
+                <el-option :key="2" label="自用" :value="2"></el-option>
+                <el-option :key="1" label="租赁" :value="1"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
 <!--          <el-col :span="6">-->
 <!--            <el-form-item label="上架状态">-->
 <!--              <el-select class="filter-item" v-model="listQuery.status" placeholder="请选择上架状态">-->
@@ -135,16 +145,16 @@
           <span>{{scope.row.companyName}}</span>
         </template>
       </el-table-column>
-      <el-table-column align="center" label="出行状态">
+      <el-table-column align="center" label="车辆状态">
         <template slot-scope="scope">
           <span>{{getVehicleStatus(scope.row.status)}}</span>
         </template>
       </el-table-column>
-<!--			<el-table-column align="center" label="车辆状态">-->
-<!--				<template slot-scope="scope">-->
-<!--					<span>上下架</span>-->
-<!--				</template>-->
-<!--			</el-table-column>-->
+			<el-table-column align="center" label="用途">
+				<template slot-scope="scope">
+					<span>{{scope.row.useTypeName}}</span>
+				</template>
+			</el-table-column>
 			<el-table-column align="center" label="操作">
 				<template slot-scope="scope">
 					<el-button
@@ -180,6 +190,19 @@
 
     <!--  添加、编辑车辆  -->
     <one-vehicle v-on:oneDialogEvent="oneDialogEvent" :title="title" :oneRow="oneRow" v-if="oneDialogVisible"></one-vehicle>
+
+    <!--  车辆添加成功后的提示  -->
+    <el-dialog :visible.sync="createdDialogVisible" @close="createdDialogVisible = false" width="40%">
+      <div class="flex-fdc-aic-jcc">
+        <img src="../../../assets/images/warning-icon.png" />
+        <div style="margin: 10px;">创建成功</div>
+        <div>请在<el-button type="text" @click="toSetPrice">车辆价格管理页面</el-button><span>设置该车租赁价格后再上架</span></div>
+      </div>
+      <div slot="footer" style="margin-top: 10px;">
+        <el-button plain @click="createdDialogVisible = false">取消</el-button>
+        <el-button type="primary" class="handle-ok" @click="createdDialogVisible = false">确定</el-button>
+      </div>
+    </el-dialog>
 	</div>
 </template>
 
@@ -239,6 +262,7 @@ export default {
 		return {
       oneDialogVisible: false, // 添加、编辑车辆弹框
       title: '添加车辆',
+      createdDialogVisible: false, // 添加车辆成功显示设置车辆价格提示
       oneRow: {}, // 当前操作项
       allVehicleBranchCompany: [],// 所属门店列表
       allVehicleCompany: [], // 所属公司列表
@@ -301,6 +325,9 @@ export default {
         companyName: undefined, // 所属公司
         parkBranchCompanyId: undefined, // 停靠门店
         modelId: undefined, // 车型
+        numberPlate: undefined, // 车牌号
+        status: undefined, // 车辆状态
+        useType: undefined // 用途
 			},
 			showMoreQueryFilter: false,
 			showMoreMoreCol: false,
@@ -364,6 +391,12 @@ export default {
 	},
 	methods: {
 	  /**
+     * 创建成功---设置车辆价格
+     */
+    toSetPrice(){
+      this.$router.push( {path: '/vehicle/vehiclePrice'} )
+    },
+	  /**
      * 获取所有门店-筛选列表
      */
     getVehicleBranchCompanyAll(){
@@ -404,38 +437,11 @@ export default {
       this.oneDialogVisible = false;
       if (e) {
         this.getList();
+        if(this.title == '添加车辆'){
+          this.createdDialogVisible = true // 车辆创建成功后的提示
+        }
       }
     },
-		handlerChange(e) {
-			console.log(e)
-		},
-		handleInput(e){
-				this.form.strongInsuranceNo=e.target.value.replace(/[^\d]/g,'');
-		},
-		cityRegions4Query() {
-			let that = this
-			if (!this.$utils.isInteger(this.listQuery.addrProvince)) {
-				return that.getAllCities()
-			}
-			that.cityList = getSonRegionByCodes(this.listQuery.addrProvince)
-			return that.cityList
-		},
-		getAllCities() {
-			var cityStr = []
-			var provinceIds = this.provinceRegions
-			for (var index in provinceIds) {
-				var sysregion = getSonRegionByCodes(provinceIds[index].id)
-				for (var i in sysregion) {
-					cityStr.push(sysregion[i])
-				}
-			}
-			this.cityList = cityStr
-			return cityStr
-		},
-
-		getValue(e) {
-			this.listQuery.addrCity = undefined
-		},
 		/**
 		 * 获取全部车型
 		 * */
@@ -460,6 +466,9 @@ export default {
         companyName: undefined, // 所属公司
         parkBranchCompanyId: undefined, // 停靠门店
         modelId: undefined, // 车型
+        numberPlate: undefined, // 车牌号
+        status: undefined, // 车辆状态
+        useType: undefined // 用途
 			}
 			this.getList()
 		},
@@ -707,6 +716,9 @@ export default {
      */
 		getList() {
 			this.listLoading = true
+      if(!this.listQuery. numberPlate){
+        this.listQuery. numberPlate = undefined // 车牌号
+      }
 			page(this.listQuery).then(response => {
         this.listLoading = false
 				if (response.code == 1) {
@@ -745,6 +757,7 @@ export default {
      */
 		handleCreate() {
       this.title = '添加车辆'
+      this.oneRow = {}
 			this.oneDialogVisible = true
 		},
     /**

src/views/vehicle/vehicleInfo/oneVehicle.vue

 <template>
-  <el-dialog :title="title" :visible.sync="oneDialogVisible" @close="closePop" :modal="false">
-    <el-form ref="form" :model="form" :rules="rules" label-width="140px" style="margin-top: -30px;max-height: 500px;overflow: auto;">
+  <el-dialog :title="title" :visible.sync="oneDialogVisible" @close="closePop" :modal="false" width="66%" class="flex-aic vehicle-dialog">
+    <el-form ref="form" :model="form" :rules="rules" label-width="140px" style="margin-top: -30px;max-height: 486px;overflow: auto;">
       <p style="padding: 10px;background: #f5f5f5;">基础信息</p>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="用途" prop="useType">
+            <el-radio v-model="form.useType" :label="1">租赁</el-radio>
+            <el-radio v-model="form.useType" :label="2">自用</el-radio>
+          </el-form-item>
+        </el-col>
+      </el-row>
       <el-row>
         <el-col :span="12">
           <el-form-item label="车牌号码" prop="numberPlate">
@@ -9,8 +17,8 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="车辆编码">
-            <el-input v-model.number="form.code" placeholder="请输入车辆编码" type="number"></el-input>
+          <el-form-item label="车辆编码" prop="code">
+            <el-input v-model="form.code" placeholder="请输入车辆编码" type="number"></el-input>
           </el-form-item>
         </el-col>
       </el-row>
@@ -353,6 +361,12 @@
     </div>
   </el-dialog>
 </template>
+
+<style lang="scss">
+  .vehicle-dialog .el-dialog{
+    margin-top: 0 !important;
+  }
+</style>
 <script type="javascript">
   import {mapGetters} from 'vuex';
   import ElFormItem from '../../../../node_modules/element-ui/packages/form/src/form-item.vue'
@@ -390,6 +404,7 @@
         allManufacturer: [], // 生产商列表
         isClick: false, // 添加、编辑-确定按钮  是否已点击
         form: {
+          useType: 1, // 用途
           // state: 1, // 1、上架   2、下架
           id: undefined, // 车辆id
           numberPlate: undefined, // 车牌号码
@@ -431,11 +446,16 @@
             message: '请选择出行状态',
             trigger: 'change'
           },
-          // state: {
-          //   required: true,
-          //   message: '请选择上下架状态',
-          //   trigger: 'change'
-          // },
+          code: {
+            required: true,
+            message: '请输入车辆编码',
+            trigger: 'blur'
+          },
+          useType: {
+            required: true,
+            message: '请选择用途',
+            trigger: 'change'
+          },
           parkBranchCompanyId: {
             required: true,
             message: '请选择停靠门店',
@@ -702,6 +722,7 @@
        */
       cleanForm(){
         this.form = {
+          useType: 1, // 用途
           id: undefined, // 车辆id
           numberPlate: undefined, // 车牌号码
           code: undefined, // 车辆编号
@@ -761,6 +782,7 @@
                   })
                   this.$emit('oneDialogEvent', true);
                 } else {
+                  this.isClick = false
                   this.$notify({
                     title: '失败',
                     message: response.message,
@@ -779,8 +801,10 @@
                     type: 'success',
                     duration: 2000
                   })
+
                   this.$emit('oneDialogEvent', true);
                 } else {
+                  this.isClick = false
                   this.$notify({
                     title: '失败',
                     message: response.message,